diff options
author | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:48:48 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:48:48 +0300 |
commit | 13bba2fa864ebe3209ae0673d93f5bbbdb4ecc05 (patch) | |
tree | ce1711bcaa1972700d0028a705f48c100d8cf276 /main | |
parent | 49ece683f1e3e891fa38e8e969669454a3017e46 (diff) |
* Makefile.am:
* gtk-gui/gui.stetic:
* MonoDevelop.Debugger.csproj:
* MonoDevelop.Debugger.addin.xml:
* MonoDevelop.Debugger/WatchPad.cs:
* MonoDevelop.Debugger/LocalsPad.cs:
* MonoDevelop.Debugger/ThreadsPad.cs:
* MonoDevelop.Debugger/Extensions.cs:
* MonoDevelop.Debugger/Initializer.cs:
* MonoDevelop.Debugger/ImmediatePad.cs:
* MonoDevelop.Debugger/DebugCommands.cs:
* MonoDevelop.Debugger/StackTracePad.cs:
* MonoDevelop.Debugger/BreakpointPad.cs:
* MonoDevelop.Debugger/ObjectValuePad.cs:
* MonoDevelop.Debugger/ExceptionsDialog.cs:
* MonoDevelop.Debugger/DebuggingService.cs:
* MonoDevelop.Debugger/ObjectValueTreeView.cs:
* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
* MonoDevelop.Debugger/BreakpointPropertiesDialog.cs:
* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
* MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj: Merged
MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
MD.Components into MD.Ide.
svn path=/trunk/monodevelop/; revision=153748
Diffstat (limited to 'main')
23 files changed, 68 insertions, 138 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/ChangeLog b/main/src/addins/MonoDevelop.Debugger/ChangeLog index 4cd95378a9..2640c63461 100644 --- a/main/src/addins/MonoDevelop.Debugger/ChangeLog +++ b/main/src/addins/MonoDevelop.Debugger/ChangeLog @@ -1,3 +1,28 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * Makefile.am: + * gtk-gui/gui.stetic: + * MonoDevelop.Debugger.csproj: + * MonoDevelop.Debugger.addin.xml: + * MonoDevelop.Debugger/WatchPad.cs: + * MonoDevelop.Debugger/LocalsPad.cs: + * MonoDevelop.Debugger/Extensions.cs: + * MonoDevelop.Debugger/ThreadsPad.cs: + * MonoDevelop.Debugger/Initializer.cs: + * MonoDevelop.Debugger/ImmediatePad.cs: + * MonoDevelop.Debugger/StackTracePad.cs: + * MonoDevelop.Debugger/DebugCommands.cs: + * MonoDevelop.Debugger/BreakpointPad.cs: + * MonoDevelop.Debugger/ObjectValuePad.cs: + * MonoDevelop.Debugger/ExceptionsDialog.cs: + * MonoDevelop.Debugger/DebuggingService.cs: + * MonoDevelop.Debugger/ObjectValueTreeView.cs: + * MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs: + * MonoDevelop.Debugger/BreakpointPropertiesDialog.cs: + * gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs: + Merged MD.Projects into MD.Core, and MD.Projects.Gui, + MD.Core.Gui and MD.Components into MD.Ide. + 2010-03-09 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Debugger/ImmediatePad.cs: Show the clear button diff --git a/main/src/addins/MonoDevelop.Debugger/Makefile.am b/main/src/addins/MonoDevelop.Debugger/Makefile.am index 2082b07aef..08683428ee 100644 --- a/main/src/addins/MonoDevelop.Debugger/Makefile.am +++ b/main/src/addins/MonoDevelop.Debugger/Makefile.am @@ -7,13 +7,8 @@ FIXTURE = /fixture=$(fixture) DEPS = \ $(top_builddir)/build/bin/Mono.Debugging.dll \ $(top_builddir)/build/bin/Mono.TextEditor.dll \ - $(top_builddir)/build/bin/MonoDevelop.Components.dll \ $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ - $(top_builddir)/build/bin/MonoDevelop.Dock.dll \ - $(top_builddir)/build/bin/MonoDevelop.Ide.dll \ - $(top_builddir)/build/bin/MonoDevelop.Projects.dll \ - $(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll + $(top_builddir)/build/bin/MonoDevelop.Ide.dll REFS = \ $(GLIB_SHARP_LIBS) \ diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog index f427f23dbb..f69475eb02 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog @@ -1,3 +1,9 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Debugger.Tests.csproj: Merged MD.Projects into + MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components + into MD.Ide. + 2010-03-03 Lluis Sanchez Gual <lluis@novell.com> * EvaluationTests.cs: diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj index 636de06beb..3d6bf964a0 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj @@ -65,35 +65,16 @@ <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Projects\MonoDevelop.Projects.csproj"> - <Project>{04BED15A-DDC5-48BC-A36C-3E360A0348C0}</Project> - <Name>MonoDevelop.Projects</Name> - </ProjectReference> <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj"> <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> <Name>Mono.TextEditor</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Components\MonoDevelop.Components.csproj"> - <Project>{3344D566-484B-4AEC-BBCF-86BC484D14B0}</Project> - <Name>MonoDevelop.Components</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Core.Gui\MonoDevelop.Core.Gui.csproj"> - <Project>{659B0888-3956-4040-BDB1-B45F6D64E7FA}</Project> - <Name>MonoDevelop.Core.Gui</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Projects.Gui\MonoDevelop.Projects.Gui.csproj"> - <Project>{00E87426-F1BD-4B55-9B3E-7267EE93E002}</Project> - <Name>MonoDevelop.Projects.Gui</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml index ceca8672e4..83e4f72375 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml @@ -9,12 +9,8 @@ version = "2.2"> <Dependencies> - <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> - <Addin id="Projects" version="2.2"/> - <Addin id="Projects.Gui" version="2.2"/> + <Addin id="Core" version="2.2"/> <Addin id="Ide" version="2.2"/> - <Addin id="Components" version="2.2"/> </Dependencies> <ExtensionPoint path="/MonoDevelop/Debugging/DebuggerEngines"> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 9a7151352d..579dda368c 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -68,45 +68,21 @@ <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Core.Gui\MonoDevelop.Core.Gui.csproj"> - <Project>{659B0888-3956-4040-BDB1-B45F6D64E7FA}</Project> - <Name>MonoDevelop.Core.Gui</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Projects\MonoDevelop.Projects.csproj"> - <Project>{04BED15A-DDC5-48BC-A36C-3E360A0348C0}</Project> - <Name>MonoDevelop.Projects</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\core\Mono.Debugging\Mono.Debugging.csproj"> <Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project> <Name>Mono.Debugging</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Components\MonoDevelop.Components.csproj"> - <Project>{3344D566-484B-4AEC-BBCF-86BC484D14B0}</Project> - <Name>MonoDevelop.Components</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Projects.Gui\MonoDevelop.Projects.Gui.csproj"> - <Project>{00E87426-F1BD-4B55-9B3E-7267EE93E002}</Project> - <Name>MonoDevelop.Projects.Gui</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj"> <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> <Name>Mono.TextEditor</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Dock\MonoDevelop.Dock.csproj"> - <Project>{2FAAB0BE-44B3-47A5-9294-758379545F59}</Project> - <Name>MonoDevelop.Dock</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs index 4dfaba0879..1a388c0c26 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs @@ -26,25 +26,19 @@ using GLib; using Gtk; -using GtkSharp; - using System; -using System.Text; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using Stock = MonoDevelop.Core.Gui.Stock; +using Stock = MonoDevelop.Ide.Gui.Stock; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Commands; using MonoDevelop.Components; using MonoDevelop.Components.Commands; using Mono.Debugging.Client; using MonoDevelop.Components.Docking; +using MonoDevelop.Ide.Gui.Components; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs index 3c7f93b323..51b2ea078d 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs @@ -26,11 +26,10 @@ // using System; -using MonoDevelop.Core.Gui; using MonoDevelop.Core; using Mono.Debugging.Client; using MonoDevelop.Projects; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs index 592d1c5555..622ea66ca2 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs @@ -26,19 +26,15 @@ // -using System; using System.Collections; using System.Collections.Generic; -using MonoDevelop.Core.Gui.Dialogs; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using Mono.Addins; using Mono.Debugging.Client; using MonoDevelop.Components; using MonoDevelop.Ide.Gui; -using MonoDevelop.Ide.Gui.Dialogs; using MonoDevelop.Components.Commands; using MonoDevelop.Projects; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs index 03379fb6c5..d665d5d388 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs @@ -26,8 +26,8 @@ using System; using System.Collections.Generic; -using MonoDevelop.Core.Gui.Dialogs; using Mono.Debugging.Client; +using MonoDevelop.Ide.Gui.Dialogs; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index 2fc662d555..7f32fbfa8a 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -27,24 +27,18 @@ // using System; -using System.Xml; -using System.Collections; using System.Collections.Generic; - -using MonoDevelop.Core; +using System.Xml; using Mono.Addins; -using MonoDevelop.Projects; +using Mono.Debugging.Client; +using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; -using MonoDevelop.Projects.Text; -using MonoDevelop.Ide.Gui.Dialogs; - +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; - -using Mono.Debugging.Client; -using Mono.Debugging.Backend; using MonoDevelop.Ide.Gui.Content; +using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; +using MonoDevelop.Projects.Text; /* * Some places we should be doing some error handling we used to toss diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs index b224914adb..d375d71268 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs @@ -28,13 +28,12 @@ using System; using System.Collections.Generic; using Gtk; -using MonoDevelop.Ide.Gui; using MonoDevelop.Core; -using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; using MonoDevelop.Projects.Dom.Parser; using MonoDevelop.Components; using Mono.Debugging.Client; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs index f47f942756..679d1f2525 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs @@ -25,14 +25,12 @@ // // -using System; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Core; -using MonoDevelop.Projects; using Mono.Debugging.Client; -using MonoDevelop.Core.Gui; +using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui.ProgressMonitoring; +using MonoDevelop.Ide; +using MonoDevelop.Ide.Gui; +using MonoDevelop.Projects; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs index d3db69aaf7..4cba8dfed5 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs @@ -29,8 +29,8 @@ using MonoDevelop.Ide.Gui; using MonoDevelop.Components; using Mono.Debugging.Client; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Components.Docking; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs index c672b98941..ae2c070e5c 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs @@ -31,6 +31,7 @@ using MonoDevelop.Components.Commands; using Mono.Debugging.Client; using MonoDevelop.Ide.Commands; using MonoDevelop.Core; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs index e07a491294..6354bd0518 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs @@ -25,13 +25,6 @@ // // -using System; -using System.Xml; -using System.Collections.Generic; -using Gtk; -using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Ide.Gui; using Mono.Debugging.Client; namespace MonoDevelop.Debugger diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs index b3bd53e1de..c1fed11cad 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs @@ -26,11 +26,7 @@ // using System; -using System.Xml; -using System.Collections.Generic; using Gtk; -using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Ide.Gui; using Mono.Debugging.Client; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs index 2acb21477f..a410d1e6c8 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs @@ -26,15 +26,16 @@ // using System; -using System.Xml; -using System.Text; using System.Collections.Generic; +using System.Text; using Gtk; using Mono.Debugging.Client; -using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Components; -using MonoDevelop.Projects.Gui.Completion; +using MonoDevelop.Core; +using MonoDevelop.Ide; +using MonoDevelop.Ide.CodeCompletion; +using MonoDevelop.Ide.Gui.Components; + namespace MonoDevelop.Debugger { @@ -236,6 +237,7 @@ namespace MonoDevelop.Debugger } else { newFont = this.Style.FontDescription; } + typeCol.Visible = !compact; crtExp.FontDesc = newFont; crtValue.FontDesc = newFont; crtType.FontDesc = newFont; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs index 67a8eb7c38..e0b8c67f26 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs @@ -1,19 +1,13 @@ -using GLib; -using Gtk; -using GtkSharp; + using System; using System.Text; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; - -using Stock = MonoDevelop.Core.Gui.Stock; +using Gtk; +using Mono.Debugging.Client; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Ide.Gui; - -using Mono.Debugging.Client; +using MonoDevelop.Ide.Gui.Components; +using Stock = MonoDevelop.Ide.Gui.Stock; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs index 1671c6f9b7..92951ef8b2 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs @@ -26,24 +26,17 @@ // THE SOFTWARE. -using GLib; using Gtk; -using GtkSharp; using System; -using System.Text; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using Stock = MonoDevelop.Core.Gui.Stock; +using Stock = MonoDevelop.Ide.Gui.Stock; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Ide.Gui; using MonoDevelop.Components; - using Mono.Debugging.Client; +using MonoDevelop.Ide.Gui.Components; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/WatchPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/WatchPad.cs index 6f7c757f90..75f2bffe66 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/WatchPad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/WatchPad.cs @@ -25,14 +25,10 @@ // // -using System; using System.Xml; using System.Collections.Generic; -using Gtk; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; using MonoDevelop.Ide.Gui; -using Mono.Debugging.Client; namespace MonoDevelop.Debugger { diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs index 58749969f4..14bbe2a8b9 100644 --- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs @@ -211,7 +211,6 @@ namespace MonoDevelop.Debugger this.radioBreakAlways = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Always break")); this.radioBreakAlways.CanFocus = true; this.radioBreakAlways.Name = "radioBreakAlways"; - this.radioBreakAlways.Active = true; this.radioBreakAlways.DrawIndicator = true; this.radioBreakAlways.UseUnderline = true; this.radioBreakAlways.Group = new global::GLib.SList (global::System.IntPtr.Zero); diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic index 6b18fe2392..bbd83fc528 100644 --- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic @@ -5,10 +5,7 @@ <target-gtk-version>2.12</target-gtk-version> </configuration> <import> - <widget-library name="../../../../build/bin/MonoDevelop.Core.Gui.dll" /> <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> - <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" /> - <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" /> <widget-library name="../../../../build/bin/Mono.TextEditor.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" internal="true" /> </import> |