diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index ab0b469770..526c9e5a25 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -15,8 +15,8 @@
-
-
+
+
@@ -38,7 +38,7 @@
-
+
@@ -1722,7 +1722,7 @@
-
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
index c69cd61255..1017ce4773 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
@@ -110,6 +110,11 @@
ICSharpCode.SharpDevelop.Dom
False
+
+ {8035765F-D51F-4A0C-A746-2FD100E19419}
+ ICSharpCode.SharpDevelop.Widgets
+ False
+
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs
index 36bd998326..81ebc9661b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs
@@ -9,6 +9,7 @@ using System;
using Debugger;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Services;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Gui.Pads
{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/DebuggerPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/DebuggerPad.cs
index 5a57cbfce1..044ca32206 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/DebuggerPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/DebuggerPad.cs
@@ -8,6 +8,7 @@
using System;
using Debugger;
using ICSharpCode.SharpDevelop.Services;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Gui.Pads
{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
index 4d40e18464..764abbfe78 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DynamicTreeDebuggerRow.cs
@@ -12,7 +12,8 @@ using System.Windows.Forms;
using Debugger;
using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Gui.TreeGrid;
+using ICSharpCode.SharpDevelop.Widgets.TreeGrid;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Services
{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/SetCurrentStatementCommand.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/SetCurrentStatementCommand.cs
index 9dc6d0f839..d8baec3ea3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/SetCurrentStatementCommand.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/SetCurrentStatementCommand.cs
@@ -8,6 +8,7 @@
using System;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Services
{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index bfe5c16ba8..eaf8b247a3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -13,11 +13,12 @@ using Debugger;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Debugging;
using BM = ICSharpCode.SharpDevelop.Bookmarks;
namespace ICSharpCode.SharpDevelop.Services
{
- public class WindowsDebugger:IDebugger
+ public class WindowsDebugger : IDebugger
{
bool useRemotingForThreadInterop = false;
@@ -299,11 +300,11 @@ namespace ICSharpCode.SharpDevelop.Services
debugger.ProcessStarted += debugger_ProcessStarted;
debugger.ProcessExited += debugger_ProcessExited;
- DebuggerService.BreakPointAdded += delegate (object sender, BM.BreakpointBookmarkEventArgs e) {
+ DebuggerService.BreakPointAdded += delegate (object sender, BreakpointBookmarkEventArgs e) {
AddBreakpoint(e.BreakpointBookmark);
};
- foreach (BM.BreakpointBookmark b in DebuggerService.Breakpoints) {
+ foreach (BreakpointBookmark b in DebuggerService.Breakpoints) {
AddBreakpoint(b);
}
@@ -312,7 +313,7 @@ namespace ICSharpCode.SharpDevelop.Services
}
}
- void AddBreakpoint(BM.BreakpointBookmark bookmark)
+ void AddBreakpoint(BreakpointBookmark bookmark)
{
SourcecodeSegment seg = new SourcecodeSegment(bookmark.FileName, bookmark.LineNumber + 1);
Breakpoint breakpoint = debugger.AddBreakpoint(seg, bookmark.IsEnabled);
diff --git a/src/AddIns/Misc/UnitTesting/Src/RunTestCommands.cs b/src/AddIns/Misc/UnitTesting/Src/RunTestCommands.cs
index 31b008f281..c67105a981 100644
--- a/src/AddIns/Misc/UnitTesting/Src/RunTestCommands.cs
+++ b/src/AddIns/Misc/UnitTesting/Src/RunTestCommands.cs
@@ -14,6 +14,7 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Project.Commands;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.UnitTesting
{
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 1368e0064f..892c3cc487 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -618,14 +618,6 @@
-
-
-
-
-
-
-
-
@@ -723,7 +715,6 @@
ICSharpCode.Core
-
ICSharpCode.SharpDevelop.addin
@@ -736,6 +727,11 @@
ICSharpCode.SharpDevelop.Dom
+
+ {8035765F-D51F-4A0C-A746-2FD100E19419}
+ ICSharpCode.SharpDevelop.Widgets
+ False
+
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Commands/BuildCommands.cs b/src/Main/Base/Project/Src/Commands/BuildCommands.cs
index 4fde3b387d..b91653634d 100644
--- a/src/Main/Base/Project/Src/Commands/BuildCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/BuildCommands.cs
@@ -11,6 +11,7 @@ using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Project.Commands
{
diff --git a/src/Main/Base/Project/Src/Commands/DebugCommands.cs b/src/Main/Base/Project/Src/Commands/DebugCommands.cs
index f26ef0ae55..68a4b18ea6 100644
--- a/src/Main/Base/Project/Src/Commands/DebugCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/DebugCommands.cs
@@ -9,6 +9,7 @@ using System;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.TextEditor;
namespace ICSharpCode.SharpDevelop.Project.Commands
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs
index 324ce40a5f..c77b1b11c3 100644
--- a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs
+++ b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs
@@ -8,7 +8,7 @@
using System;
using ICSharpCode.Core;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
///
/// Tests if the debugger supports a certain feature.
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs
index 8ad940fce2..b51de6b6bb 100644
--- a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs
+++ b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs
@@ -8,7 +8,7 @@
using System;
using ICSharpCode.Core;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
///
/// Tests the values of DebuggerService.CurrentDebugger.IsDebugging (debugger attached to a process)
diff --git a/src/Main/Base/Project/Src/Project/MSBuildProject.cs b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
index 6d210727e5..2108263d0f 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildProject.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
@@ -17,6 +17,7 @@ using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Internal.Templates;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.Project
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs
index 0388f777a9..50180e7ca5 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs
@@ -9,8 +9,9 @@ using System;
using System.Drawing;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
+using ICSharpCode.SharpDevelop.Bookmarks;
-namespace ICSharpCode.SharpDevelop.Bookmarks
+namespace ICSharpCode.SharpDevelop.Debugging
{
public class BreakpointBookmark : SDMarkerBookmark
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmarkEventArgs.cs b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmarkEventArgs.cs
index d530c13c42..f9d39822c7 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmarkEventArgs.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmarkEventArgs.cs
@@ -7,7 +7,7 @@
using System;
-namespace ICSharpCode.SharpDevelop.Bookmarks
+namespace ICSharpCode.SharpDevelop.Debugging
{
public class BreakpointBookmarkEventArgs: EventArgs
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs
index 3d7c4b6014..d494f42f6c 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs
@@ -11,8 +11,9 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
+using ICSharpCode.SharpDevelop.Bookmarks;
-namespace ICSharpCode.SharpDevelop.Bookmarks
+namespace ICSharpCode.SharpDevelop.Debugging
{
public class CurrentLineBookmark: SDMarkerBookmark
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerDoozer.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerDoozer.cs
index 0387ecf14f..f72b569d90 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerDoozer.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerDoozer.cs
@@ -9,7 +9,7 @@ using System;
using System.Collections;
using ICSharpCode.Core;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
///
/// Creates debuggers.
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerGridControl.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerGridControl.cs
index b6d7a3ba61..eed61cdf50 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerGridControl.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerGridControl.cs
@@ -10,9 +10,9 @@ using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Gui.TreeGrid;
+using ICSharpCode.SharpDevelop.Widgets.TreeGrid;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
public class DebuggerGridControl : DynamicList
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
index eca8261799..2933ba74ab 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
@@ -22,7 +22,7 @@ using ITextAreaToolTipProvider = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Edit
using ITextEditorControlProvider = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider;
using ToolTipInfo = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ToolTipInfo;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
public static class DebuggerService
{
@@ -113,7 +113,7 @@ namespace ICSharpCode.SharpDevelop
static void OnDebugStopped(object sender, EventArgs e)
{
- BM.CurrentLineBookmark.Remove();
+ CurrentLineBookmark.Remove();
WorkbenchSingleton.Workbench.WorkbenchLayout.StoreConfiguration();
LayoutConfiguration.CurrentLayoutName = oldLayoutConfiguration;
if (DebugStopped != null)
@@ -145,36 +145,36 @@ namespace ICSharpCode.SharpDevelop
}
- public static event EventHandler BreakPointChanged;
- public static event EventHandler BreakPointAdded;
- public static event EventHandler BreakPointRemoved;
+ public static event EventHandler BreakPointChanged;
+ public static event EventHandler BreakPointAdded;
+ public static event EventHandler BreakPointRemoved;
- static void OnBreakPointChanged(BM.BreakpointBookmarkEventArgs e)
+ static void OnBreakPointChanged(BreakpointBookmarkEventArgs e)
{
if (BreakPointChanged != null) {
BreakPointChanged(null, e);
}
}
- static void OnBreakPointAdded(BM.BreakpointBookmarkEventArgs e)
+ static void OnBreakPointAdded(BreakpointBookmarkEventArgs e)
{
if (BreakPointAdded != null) {
BreakPointAdded(null, e);
}
}
- static void OnBreakPointRemoved(BM.BreakpointBookmarkEventArgs e)
+ static void OnBreakPointRemoved(BreakpointBookmarkEventArgs e)
{
if (BreakPointRemoved != null) {
BreakPointRemoved(null, e);
}
}
- public static IList Breakpoints {
+ public static IList Breakpoints {
get {
- List breakpoints = new List();
+ List breakpoints = new List();
foreach (BM.SDBookmark bookmark in BM.BookmarkManager.Bookmarks) {
- BM.BreakpointBookmark breakpoint = bookmark as BM.BreakpointBookmark;
+ BreakpointBookmark breakpoint = bookmark as BreakpointBookmark;
if (breakpoint != null) {
breakpoints.Add(breakpoint);
}
@@ -185,34 +185,34 @@ namespace ICSharpCode.SharpDevelop
static void BookmarkAdded(object sender, BM.BookmarkEventArgs e)
{
- BM.BreakpointBookmark bb = e.Bookmark as BM.BreakpointBookmark;
+ BreakpointBookmark bb = e.Bookmark as BreakpointBookmark;
if (bb != null) {
bb.LineNumberChanged += BookmarkChanged;
- OnBreakPointAdded(new BM.BreakpointBookmarkEventArgs(bb));
+ OnBreakPointAdded(new BreakpointBookmarkEventArgs(bb));
}
}
static void BookmarkRemoved(object sender, BM.BookmarkEventArgs e)
{
- BM.BreakpointBookmark bb = e.Bookmark as BM.BreakpointBookmark;
+ BreakpointBookmark bb = e.Bookmark as BreakpointBookmark;
if (bb != null) {
bb.RemoveMarker();
- OnBreakPointRemoved(new BM.BreakpointBookmarkEventArgs(bb));
+ OnBreakPointRemoved(new BreakpointBookmarkEventArgs(bb));
}
}
static void BookmarkChanged(object sender, EventArgs e)
{
- BM.BreakpointBookmark bb = sender as BM.BreakpointBookmark;
+ BreakpointBookmark bb = sender as BreakpointBookmark;
if (bb != null) {
- OnBreakPointChanged(new BM.BreakpointBookmarkEventArgs(bb));
+ OnBreakPointChanged(new BreakpointBookmarkEventArgs(bb));
}
}
public static void ToggleBreakpointAt(IDocument document, string fileName, int lineNumber)
{
foreach (Bookmark m in document.BookmarkManager.Marks) {
- BM.BreakpointBookmark breakpoint = m as BM.BreakpointBookmark;
+ BreakpointBookmark breakpoint = m as BreakpointBookmark;
if (breakpoint != null) {
if (breakpoint.LineNumber == lineNumber) {
document.BookmarkManager.RemoveMark(m);
@@ -222,7 +222,7 @@ namespace ICSharpCode.SharpDevelop
}
foreach (char ch in document.GetText(document.GetLineSegment(lineNumber))) {
if (!char.IsWhiteSpace(ch)) {
- document.BookmarkManager.AddMark(new BM.BreakpointBookmark(fileName, document, lineNumber));
+ document.BookmarkManager.AddMark(new BreakpointBookmark(fileName, document, lineNumber));
document.RequestUpdate(new TextAreaUpdate(TextAreaUpdateType.SingleLine, lineNumber));
document.CommitUpdate();
break;
@@ -260,13 +260,13 @@ namespace ICSharpCode.SharpDevelop
public static void RemoveCurrentLineMarker()
{
- BM.CurrentLineBookmark.Remove();
+ CurrentLineBookmark.Remove();
}
public static void JumpToCurrentLine(string SourceFullFilename, int StartLine, int StartColumn, int EndLine, int EndColumn)
{
IViewContent viewContent = FileService.JumpToFilePosition(SourceFullFilename, StartLine - 1, StartColumn - 1);
- BM.CurrentLineBookmark.SetPosition(viewContent, StartLine, StartColumn, EndLine, EndColumn);
+ CurrentLineBookmark.SetPosition(viewContent, StartLine, StartColumn, EndLine, EndColumn);
}
static void IconBarMouseDown(AbstractMargin iconBar, Point mousepos, MouseButtons mouseButtons)
@@ -315,7 +315,7 @@ namespace ICSharpCode.SharpDevelop
}
if (ti != null) {
- toolTipControl = ti.ToolTipControl;
+ toolTipControl = ti.ToolTipControl as DebuggerGridControl;
if (ti.ToolTipText != null) {
e.ShowToolTip(ti.ToolTipText);
}
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs b/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
index 4f2297e0eb..a3becdfb03 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
@@ -10,7 +10,7 @@ using System.Diagnostics;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
public class DefaultDebugger : IDebugger
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs b/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
index 8184ccda25..e6693da84b 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
@@ -9,7 +9,7 @@ using System;
using System.Diagnostics;
using ICSharpCode.SharpDevelop.Project;
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Debugging
{
public interface IDebugger : IDisposable
{
diff --git a/src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkConverter.cs b/src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkConverter.cs
index 624240bbf8..9e19244d5a 100644
--- a/src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkConverter.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkConverter.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
SDBookmark bookmark;
switch (v[0]) {
case "Breakpoint":
- bookmark = new BreakpointBookmark(fileName, null, lineNumber);
+ bookmark = new Debugging.BreakpointBookmark(fileName, null, lineNumber);
break;
default:
bookmark = new SDBookmark(fileName, null, lineNumber);
@@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
SDBookmark bookmark = value as SDBookmark;
if (destinationType == typeof(string) && bookmark != null) {
StringBuilder b = new StringBuilder();
- if (bookmark is BreakpointBookmark) {
+ if (bookmark is Debugging.BreakpointBookmark) {
b.Append("Breakpoint");
} else {
b.Append("Bookmark");
diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs
index 2fc6359292..ed5532463d 100644
--- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs
@@ -10,6 +10,7 @@ using System.Drawing;
using ICSharpCode.Core;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
+using ICSharpCode.SharpDevelop.Debugging;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{
diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaToolTipProvider.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaToolTipProvider.cs
index e8d3226aaa..2356917e16 100644
--- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaToolTipProvider.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/ITextAreaToolTipProvider.cs
@@ -7,6 +7,7 @@
using System;
using ICSharpCode.TextEditor;
+using System.Windows.Forms;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{
@@ -45,9 +46,9 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
/// Gets the DebuggerGridControl to be shown as tooltip.
/// May be null.
///
- public DebuggerGridControl ToolTipControl {
+ public Control ToolTipControl {
get {
- return this.toolTipObject as DebuggerGridControl;
+ return this.toolTipObject as Control;
}
}
@@ -64,7 +65,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
/// Initializes a new instance of the class.
///
/// The DebuggerGridControl to be shown as tooltip.
- public ToolTipInfo(DebuggerGridControl toolTipControl)
+ public ToolTipInfo(Control toolTipControl)
{
this.toolTipObject = toolTipControl;
}
diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/ICSharpCode.SharpDevelop.Widgets.sln b/src/Main/ICSharpCode.SharpDevelop.Widgets/ICSharpCode.SharpDevelop.Widgets.sln
new file mode 100644
index 0000000000..4e71a7f93f
--- /dev/null
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/ICSharpCode.SharpDevelop.Widgets.sln
@@ -0,0 +1,7 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# SharpDevelop 2.1.0.1947
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+EndProject
+Global
+EndGlobal
diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Configuration/AssemblyInfo.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Configuration/AssemblyInfo.cs
new file mode 100644
index 0000000000..fd6961c2b0
--- /dev/null
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/Configuration/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+//
+//
+//
+//
+// $Revision: 1965 $
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: CLSCompliant(true)]
+[assembly: StringFreezing()]
+
+[assembly: AssemblyTitle("ICSharpCode.SharpDevelop.Widgets")]
+[assembly: AssemblyDescription("UI Widgets for SharpDevelop")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/DesignHelper.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/DesignHelper.cs
new file mode 100644
index 0000000000..7591300e32
--- /dev/null
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/DesignHelper.cs
@@ -0,0 +1,39 @@
+/*
+ * Created by SharpDevelop.
+ * User: Daniel Grunwald
+ * Date: 10/27/2006
+ * Time: 4:59 PM
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.Windows.Forms;
+
+namespace ICSharpCode.SharpDevelop.Widgets
+{
+ public static class DesignHelper
+ {
+ static int shadowStatus;
+
+ ///
+ /// Adds a shadow to the create params if it is supported by the operating system.
+ ///
+ public static void AddShadowToWindow(CreateParams createParams)
+ {
+ if (shadowStatus == 0) {
+ // Test OS version
+ shadowStatus = -1; // shadow not supported
+ if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+ Version ver = Environment.OSVersion.Version;
+ if (ver.Major > 5 || ver.Major == 5 && ver.Minor >= 1) {
+ shadowStatus = 1;
+ }
+ }
+ }
+ if (shadowStatus == 1) {
+ createParams.ClassStyle |= 0x00020000; // set CS_DROPSHADOW
+ }
+ }
+ }
+}
diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
new file mode 100644
index 0000000000..f7bbbf0720
--- /dev/null
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
@@ -0,0 +1,66 @@
+
+
+ Library
+ ICSharpCode.SharpDevelop.Widgets
+ ICSharpCode.SharpDevelop.Widgets
+ Debug
+ AnyCPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}
+ ..\..\..\..\bin\
+ False
+ False
+ 4
+ false
+ True
+ ..\..\ICSharpCode.SharpDevelop.snk
+ False
+ File
+
+
+ False
+ DEBUG;TRACE
+ true
+ Full
+ True
+
+
+ True
+ TRACE
+ False
+ None
+ False
+
+
+ False
+ Auto
+ 4194304
+ AnyCPU
+ 4096
+
+
+
+
+
+
+
+
+
+ Configuration\GlobalAssemblyInfo.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/CollectionWithEvents.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/CollectionWithEvents.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/CollectionWithEvents.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/CollectionWithEvents.cs
index c7687005d8..6a3e304469 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/CollectionWithEvents.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/CollectionWithEvents.cs
@@ -9,7 +9,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class CollectionItemEventArgs : EventArgs
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicList.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicList.cs
similarity index 99%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/DynamicList.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicList.cs
index 790e5b4bd0..051f5c029e 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicList.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicList.cs
@@ -12,7 +12,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class DynamicList : UserControl, VerticalScrollContainer.IScrollable
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListColumn.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListColumn.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListColumn.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListColumn.cs
index 013ffbbcbb..05d2cb171f 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListColumn.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListColumn.cs
@@ -8,7 +8,7 @@
using System;
using System.Drawing;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class DynamicListColumn : ICloneable
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListItem.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListItem.cs
similarity index 99%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListItem.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListItem.cs
index 6569e2b875..3bc13da239 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListItem.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListItem.cs
@@ -10,7 +10,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public sealed class DynamicListItem
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListRow.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListRow.cs
similarity index 97%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListRow.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListRow.cs
index adf87f7a80..318e17c95c 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicListRow.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicListRow.cs
@@ -8,7 +8,7 @@
using System;
using System.Diagnostics;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class DynamicListRow
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicTreeRow.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicTreeRow.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/DynamicTreeRow.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicTreeRow.cs
index b03152e973..6ae793adb5 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/DynamicTreeRow.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/DynamicTreeRow.cs
@@ -11,7 +11,7 @@ using System.Drawing;
using System.Drawing.Drawing2D;
using System.Windows.Forms;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class DynamicTreeRow : DynamicListRow
{
@@ -330,7 +330,7 @@ namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
protected override CreateParams CreateParams {
get {
CreateParams p = base.CreateParams;
- ICSharpCode.TextEditor.Gui.CompletionWindow.AbstractCompletionWindow.AddShadowToWindow(p);
+ DesignHelper.AddShadowToWindow(p);
return p;
}
}
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/ScrollButton.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/ScrollButton.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/ScrollButton.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/ScrollButton.cs
index e13fa183ae..40911a1441 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/ScrollButton.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/ScrollButton.cs
@@ -9,7 +9,7 @@ using System;
using System.Drawing;
using System.Windows.Forms;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class ScrollButtonControl : Control
{
diff --git a/src/Main/Base/Project/Src/Gui/TreeGrid/VerticalScrollContainer.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/VerticalScrollContainer.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/TreeGrid/VerticalScrollContainer.cs
rename to src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/VerticalScrollContainer.cs
index f36387555b..3ac5c2a629 100644
--- a/src/Main/Base/Project/Src/Gui/TreeGrid/VerticalScrollContainer.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/TreeGrid/VerticalScrollContainer.cs
@@ -8,7 +8,7 @@
using System;
using System.Windows.Forms;
-namespace ICSharpCode.SharpDevelop.Gui.TreeGrid
+namespace ICSharpCode.SharpDevelop.Widgets.TreeGrid
{
public class VerticalScrollContainer : Control
{
diff --git a/src/SharpDevelop.Tests.sln b/src/SharpDevelop.Tests.sln
index 805b820d9f..c7c2140052 100644
--- a/src/SharpDevelop.Tests.sln
+++ b/src/SharpDevelop.Tests.sln
@@ -1,5 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.1663
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# SharpDevelop 2.1.0.1947
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@@ -76,6 +77,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
@@ -258,6 +261,14 @@ Global
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E6CD1999-C4C6-4298-87C0-47309AB1EB09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E6CD1999-C4C6-4298-87C0-47309AB1EB09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E6CD1999-C4C6-4298-87C0-47309AB1EB09}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E6CD1999-C4C6-4298-87C0-47309AB1EB09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -301,5 +312,6 @@ Global
{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+ {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index 6fd5a18cd9..f524e0e06d 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -135,6 +135,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
@@ -397,6 +399,10 @@ Global
{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Release|Any CPU.Build.0 = Release|Any CPU
{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@@ -457,5 +463,6 @@ Global
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+ {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal