diff options
| author | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:56:54 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:56:54 +0300 |
| commit | cac14501fe98b97ed982a89e99752121c972b9ca (patch) | |
| tree | ced66cfe9ece31d3952d0a1efc3a4e6f5a5d0b5c /extras/MonoDevelop.Profiling | |
| parent | a984a059c7b1a00c9055a414b4f5d19bebcb7a55 (diff) | |
* MonoDevelop.Profiling.mds:
* MonoDevelop.Profiling/gtk-gui/gui.stetic:
* MonoDevelop.Profiling/ProfilingContext.cs:
* MonoDevelop.Profiling/AbstractProfiler.cs:
* MonoDevelop.Profiling/ProfilingService.cs:
* MonoDevelop.Profiling/Pads/ProfilingPad.cs:
* MonoDevelop.Profiling/gtk-gui/generated.cs:
* MonoDevelop.Profiling/ProfilingOperations.cs:
* MonoDevelop.Profiling/Commands/PadCommands.cs:
* MonoDevelop.Profiling/Commands/ToolCommands.cs:
* MonoDevelop.Profiling/MonoDevelop.Profiling.mdp:
* MonoDevelop.Profiling/Commands/ProjectCommands.cs:
* MonoDevelop.Profiling.HeapShot/gtk-gui/objects.xml:
* MonoDevelop.Profiling.HeapBuddy/gtk-gui/gui.stetic:
* MonoDevelop.Profiling.HeapShot/HeapShotProfiler.cs:
* MonoDevelop.Profiling.HeapShot/gtk-gui/generated.cs:
* MonoDevelop.Profiling.HeapBuddy/gtk-gui/generated.cs:
* MonoDevelop.Profiling.HeapBuddy/HeapBuddyProfiler.cs:
* MonoDevelop.Profiling/Dialogs/SelectProcessDialog.cs:
* MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml:
* MonoDevelop.Profiling/Commands/AbstractProfilerList.cs:
* MonoDevelop.Profiling.HeapBuddy/Gui/TypesNodeBuilder.cs:
* MonoDevelop.Profiling.HeapBuddy/Gui/HistoryNodeBuilder.cs:
* MonoDevelop.Profiling.HeapBuddy/Gui/BacktracesNodeBuilder.cs:
* MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.mdp:
* MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.mdp:
* MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotView.cs:
* MonoDevelop.Profiling/Pads/ProfilingSnapshotCollectionNodeBuilder.cs:
* MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml:
* MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml:
* MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs:
* MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotNodeBuilder.cs:
* MonoDevelop.Profiling.HeapBuddy/Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs:
* MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs:
* MonoDevelop.Profiling.HeapShot/gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs:
Merged MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
and MD.Components into MD.Ide.
svn path=/trunk/monodevelop/; revision=153751
Diffstat (limited to 'extras/MonoDevelop.Profiling')
41 files changed, 748 insertions, 721 deletions
diff --git a/extras/MonoDevelop.Profiling/ChangeLog b/extras/MonoDevelop.Profiling/ChangeLog index 733fd26224..f0d9969748 100644 --- a/extras/MonoDevelop.Profiling/ChangeLog +++ b/extras/MonoDevelop.Profiling/ChangeLog @@ -1,3 +1,9 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Profiling.mds: Merged MD.Projects into MD.Core, + and MD.Projects.Gui, MD.Core.Gui and MD.Components into + MD.Ide. + 2009-10-30 Lluis Sanchez Gual <lluis@novell.com> * configure.in: Bump MD version. diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/ChangeLog b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/ChangeLog index cc58d0dc28..d29a78402b 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/ChangeLog +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/ChangeLog @@ -1,3 +1,15 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * HeapBuddyProfiler.cs: + * Gui/TypesNodeBuilder.cs: + * Gui/HistoryNodeBuilder.cs: + * Gui/BacktracesNodeBuilder.cs: + * MonoDevelop.Profiling.HeapBuddy.mdp: + * MonoDevelop.Profiling.HeapBuddy.addin.xml: + * Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs: Merged + MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui + and MD.Components into MD.Ide. + 2009-10-30 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Profiling.HeapBuddy.addin.xml: Bump MD version. diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/BacktracesNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/BacktracesNodeBuilder.cs index 0b5a1af68b..59f91e3a15 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/BacktracesNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/BacktracesNodeBuilder.cs @@ -28,7 +28,7 @@ using Gtk; using System; using MonoDevelop.Core; using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs index f6d9c5f562..3e73a5307c 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs @@ -28,7 +28,7 @@ using Gtk; using System; using MonoDevelop.Core; using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HistoryNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HistoryNodeBuilder.cs index a22676c54d..578dcb034a 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HistoryNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/HistoryNodeBuilder.cs @@ -28,7 +28,7 @@ using Gtk; using System; using MonoDevelop.Core; using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/TypesNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/TypesNodeBuilder.cs index 11ff09392c..1121503758 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/TypesNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/Gui/TypesNodeBuilder.cs @@ -28,7 +28,7 @@ using Gtk; using System; using MonoDevelop.Core; using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/HeapBuddyProfiler.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/HeapBuddyProfiler.cs index 55e8a873eb..4df2808da1 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/HeapBuddyProfiler.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/HeapBuddyProfiler.cs @@ -28,7 +28,7 @@ using System; using System.IO; using System.Threading; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Core.Execution; using MonoDevelop.Profiling; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml index ba266b77af..918ff33d9a 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml @@ -14,7 +14,6 @@ <Dependencies> <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> <Addin id="Ide" version="2.2"/> <Addin id="Profiling" version="0.2.0"/> </Dependencies> diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.mdp b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.mdp index ae57e0242b..45d6a82a54 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.mdp +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.mdp @@ -1,52 +1,58 @@ -<Project name="MonoDevelop.Profiling.HeapBuddy" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> +<Project name="MonoDevelop.Profiling.HeapBuddy" fileversion="2.0" DefaultNamespace="MonoDevelop.Profiling.HeapBuddy" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar /> + <ResourcesVar Sync="True" Name="RES" /> + <OthersVar /> + <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> + </MonoDevelop.Autotools.MakefileInfo> <Configurations active="Debug"> <Configuration name="Debug" ctype="DotNetProjectConfiguration"> <Output directory="../build" assembly="MonoDevelop.Profiling.HeapBuddy" /> <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> <Configuration name="Release" ctype="DotNetProjectConfiguration"> <Output directory="../build" assembly="MonoDevelop.Profiling.HeapBuddy" /> <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> </Configurations> <Contents> - <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" /> - <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" /> - <File name="HeapBuddyProfiler.cs" subtype="Code" buildaction="Compile" /> - <File name="HeapBuddyProfilingSnapshot.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/BacktracesNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/BacktracesView.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/FakeNodes.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/HistoryNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/HistoryView.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/TypesNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/TypesView.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Backtrace.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Frame.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Gc.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/ObjectStats.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/OutfileReader.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Resize.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Type.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/Util.cs" subtype="Code" buildaction="Compile" /> - <File name="MonoDevelop.Profiling.HeapBuddy.addin.xml" subtype="Code" buildaction="EmbedAsResource" /> - <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> + <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" /> + <File subtype="Code" buildaction="Compile" name="HeapBuddyProfiler.cs" /> + <File subtype="Code" buildaction="Compile" name="HeapBuddyProfilingSnapshot.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/BacktracesNodeBuilder.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/BacktracesView.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/FakeNodes.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/HeapBuddyProfilingSnapshotNodeBuilder.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/HistoryNodeBuilder.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/HistoryView.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/TypesNodeBuilder.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/TypesView.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Backtrace.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Frame.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Gc.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/ObjectStats.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/OutfileReader.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Resize.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Type.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/Util.cs" /> + <File subtype="Code" buildaction="EmbedAsResource" name="MonoDevelop.Profiling.HeapBuddy.addin.xml" /> + <File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" /> </Contents> <References> <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core.Gui, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Profiling" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Components, Version=0.19.0.0, Culture=neutral, PublicKeyToken=null" /> <ProjectReference type="Gac" localcopy="True" refto="NRefactory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> <ProjectReference type="Gac" localcopy="True" refto="Mono.Cecil, Version=0.6.8.8607, Culture=neutral, PublicKeyToken=null" /> <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> @@ -54,17 +60,9 @@ <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects.Gui, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=43ec5927c50c544e" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Core,2.2" refto="MonoDevelop.Core,2.2" ctype="AddinReference" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Ide,2.2" refto="MonoDevelop.Ide,2.2" ctype="AddinReference" /> </References> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> - <BuildFilesVar Sync="True" Name="FILES" /> - <DeployFilesVar /> - <ResourcesVar Sync="True" Name="RES" /> - <OthersVar /> - <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> - </MonoDevelop.Autotools.MakefileInfo> </Project>
\ No newline at end of file diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/ChangeLog b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/ChangeLog index ff8b234088..dba2c192e1 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/ChangeLog +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/ChangeLog @@ -1,3 +1,9 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * gui.stetic: + * generated.cs: Merged MD.Projects into MD.Core, and + MD.Projects.Gui, MD.Core.Gui and MD.Components into MD.Ide. + 2009-08-26 Lluis Sanchez Gual <lluis@novell.com> * gui.stetic: We now depend on gtk# 2.12.8, Mono 2.4, and diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/generated.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/generated.cs index c67023088d..8463caae89 100755 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/generated.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/generated.cs @@ -1,35 +1,29 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// Mono Runtime Version: 2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace Stetic { - - - internal class Gui { - - private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup(string name) { - return null; - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace Stetic +{ + internal class Gui + { + private static bool initialized; + + static internal void Initialize (Gtk.Widget iconRenderer) + { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup (System.Type type) + { + return Stetic.ActionGroups.GetActionGroup (type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup (string name) + { + return null; + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/gui.stetic b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/gui.stetic index 5bb7f6ed37..0dd98eae73 100755 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/gui.stetic +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/gtk-gui/gui.stetic @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>../</images-root-path> - <target-gtk-version>2.12</target-gtk-version> </configuration> <import> <widget-library name="MonoDevelop.Components, Version=0.16.0.0, Culture=neutral" /> diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/ChangeLog b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/ChangeLog index 085ccc04aa..8d4d59fac5 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/ChangeLog +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/ChangeLog @@ -1,3 +1,16 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * gtk-gui/objects.xml: + * HeapShotProfiler.cs: + * gtk-gui/generated.cs: + * MonoDevelop.Profiling.HeapShot.mdp: + * Gui/HeapShotProfilingSnapshotView.cs: + * MonoDevelop.Profiling.HeapShot.addin.xml: + * Gui/HeapShotProfilingSnapshotNodeBuilder.cs: + * gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs: + Merged MD.Projects into MD.Core, and MD.Projects.Gui, + MD.Core.Gui and MD.Components into MD.Ide. + 2009-10-30 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Profiling.HeapShot.addin.xml: Bump MD version. diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotNodeBuilder.cs index 930651dc4f..866dd68edd 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotNodeBuilder.cs @@ -28,7 +28,7 @@ using Gtk; using System; using MonoDevelop.Core; using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotView.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotView.cs index 82dd97237e..ade75f7c32 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotView.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/Gui/HeapShotProfilingSnapshotView.cs @@ -27,6 +27,7 @@ using Gtk; using System; using MonoDevelop.Core; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Pads; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/HeapShotProfiler.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/HeapShotProfiler.cs index e93d227517..f51cdd65b2 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/HeapShotProfiler.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/HeapShotProfiler.cs @@ -28,7 +28,7 @@ using System; using System.IO; using System.Threading; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Profiling; namespace MonoDevelop.Profiling.HeapShot diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml index d522360e7a..13eb8abb82 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml @@ -14,7 +14,6 @@ <Dependencies> <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> <Addin id="Ide" version="2.2"/> <Addin id="Profiling" version="0.2.0"/> </Dependencies> diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.mdp b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.mdp index a37a92f287..16504b592e 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.mdp +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.mdp @@ -1,43 +1,49 @@ -<Project name="MonoDevelop.Profiling.HeapShot" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> +<Project name="MonoDevelop.Profiling.HeapShot" fileversion="2.0" DefaultNamespace="MonoDevelop.Profiling.HeapShot" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar /> + <ResourcesVar Sync="True" Name="RES" /> + <OthersVar /> + <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> + </MonoDevelop.Autotools.MakefileInfo> <Configurations active="Debug"> <Configuration name="Debug" ctype="DotNetProjectConfiguration"> <Output directory="../build" assembly="MonoDevelop.Profiling.HeapShot" /> <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> <Configuration name="Release" ctype="DotNetProjectConfiguration"> <Output directory="../build" assembly="MonoDevelop.Profiling.HeapShot" /> <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> </Configurations> <Contents> - <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" /> - <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" /> - <File name="HeapShotProfiler.cs" subtype="Code" buildaction="Compile" /> - <File name="HeapShotProfilingSnapshot.cs" subtype="Code" buildaction="Compile" /> - <File name="MonoDevelop.Profiling.HeapShot.addin.xml" subtype="Code" buildaction="EmbedAsResource" /> - <File name="Snapshot/FieldInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/ObjectInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/ObjectMapReader.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/ObjectReference.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/ReferenceNode.cs" subtype="Code" buildaction="Compile" /> - <File name="Snapshot/TypeInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/HeapShotProfilingSnapshotNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/HeapShotProfilingSnapshotView.cs" subtype="Code" buildaction="Compile" /> - <File name="Gui/ReferenceTreeViewer.cs" subtype="Code" buildaction="Compile" /> - <File name="gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs" subtype="Code" buildaction="Compile" /> - <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> + <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" /> + <File subtype="Code" buildaction="Compile" name="HeapShotProfiler.cs" /> + <File subtype="Code" buildaction="Compile" name="HeapShotProfilingSnapshot.cs" /> + <File subtype="Code" buildaction="EmbedAsResource" name="MonoDevelop.Profiling.HeapShot.addin.xml" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/FieldInfo.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/ObjectInfo.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/ObjectMapReader.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/ObjectReference.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/ReferenceNode.cs" /> + <File subtype="Code" buildaction="Compile" name="Snapshot/TypeInfo.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/HeapShotProfilingSnapshotNodeBuilder.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/HeapShotProfilingSnapshotView.cs" /> + <File subtype="Code" buildaction="Compile" name="Gui/ReferenceTreeViewer.cs" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs" /> + <File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" /> </Contents> <References> <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core.Gui, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Components, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Profiling" /> <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> @@ -48,17 +54,9 @@ <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects.Gui, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=43ec5927c50c544e" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Core,2.2" refto="MonoDevelop.Core,2.2" ctype="AddinReference" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Ide,2.2" refto="MonoDevelop.Ide,2.2" ctype="AddinReference" /> </References> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> - <BuildFilesVar Sync="True" Name="FILES" /> - <DeployFilesVar /> - <ResourcesVar Sync="True" Name="RES" /> - <OthersVar /> - <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> - </MonoDevelop.Autotools.MakefileInfo> </Project>
\ No newline at end of file diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs index e99f97dd8e..4d6a2f0eee 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.cs @@ -1,116 +1,107 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// Mono Runtime Version: 2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace MonoDevelop.Profiling.HeapShot { - - - public partial class ReferenceTreeViewer { - - private Gtk.VBox vbox1; - - private Gtk.ScrolledWindow scrolledwindow1; - - private Gtk.TreeView treeview; - - private Gtk.HBox hbox1; - - private Gtk.HBox boxFilter; - - private Gtk.Entry entryFilter; - - private Gtk.Button buttonFilter; - - private Gtk.CheckButton checkInverse; - - protected virtual void Build() { - Stetic.Gui.Initialize(this); - // Widget MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer - Stetic.BinContainer.Attach(this); - this.Events = ((Gdk.EventMask)(256)); - this.Name = "MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer"; - // Container child MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.Gtk.Container+ContainerChild - this.vbox1 = new Gtk.VBox(); - this.vbox1.Name = "vbox1"; - this.vbox1.Spacing = 6; - this.vbox1.BorderWidth = ((uint)(6)); - // Container child vbox1.Gtk.Box+BoxChild - this.scrolledwindow1 = new Gtk.ScrolledWindow(); - this.scrolledwindow1.CanFocus = true; - this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); - // Container child scrolledwindow1.Gtk.Container+ContainerChild - this.treeview = new Gtk.TreeView(); - this.treeview.CanFocus = true; - this.treeview.Events = ((Gdk.EventMask)(8196)); - this.treeview.Name = "treeview"; - this.treeview.HeadersClickable = true; - this.scrolledwindow1.Add(this.treeview); - this.vbox1.Add(this.scrolledwindow1); - Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox1[this.scrolledwindow1])); - w2.Position = 0; - // Container child vbox1.Gtk.Box+BoxChild - this.hbox1 = new Gtk.HBox(); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild - this.boxFilter = new Gtk.HBox(); - this.boxFilter.Name = "boxFilter"; - this.boxFilter.Spacing = 3; - // Container child boxFilter.Gtk.Box+BoxChild - this.entryFilter = new Gtk.Entry(); - this.entryFilter.CanFocus = true; - this.entryFilter.Name = "entryFilter"; - this.entryFilter.IsEditable = true; - this.entryFilter.InvisibleChar = '●'; - this.boxFilter.Add(this.entryFilter); - Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.boxFilter[this.entryFilter])); - w3.Position = 0; - // Container child boxFilter.Gtk.Box+BoxChild - this.buttonFilter = new Gtk.Button(); - this.buttonFilter.CanFocus = true; - this.buttonFilter.Name = "buttonFilter"; - this.buttonFilter.Label = "Filter"; - this.boxFilter.Add(this.buttonFilter); - Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.boxFilter[this.buttonFilter])); - w4.Position = 1; - w4.Expand = false; - w4.Fill = false; - this.hbox1.Add(this.boxFilter); - Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox1[this.boxFilter])); - w5.Position = 0; - // Container child hbox1.Gtk.Box+BoxChild - this.checkInverse = new Gtk.CheckButton(); - this.checkInverse.CanFocus = true; - this.checkInverse.Name = "checkInverse"; - this.checkInverse.Label = "Inverse references"; - this.checkInverse.DrawIndicator = true; - this.hbox1.Add(this.checkInverse); - Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox1[this.checkInverse])); - w6.Position = 1; - w6.Expand = false; - w6.Fill = false; - this.vbox1.Add(this.hbox1); - Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); - w7.Position = 1; - w7.Expand = false; - w7.Fill = false; - this.Add(this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll(); - } - this.Show(); - this.treeview.MotionNotifyEvent += new Gtk.MotionNotifyEventHandler(this.OnTreeviewMotionNotifyEvent); - this.treeview.LeaveNotifyEvent += new Gtk.LeaveNotifyEventHandler(this.OnTreeviewLeaveNotifyEvent); - this.entryFilter.Activated += new System.EventHandler(this.OnEntryFilterActivated); - this.buttonFilter.Clicked += new System.EventHandler(this.OnButtonFilterClicked); - this.checkInverse.Clicked += new System.EventHandler(this.OnCheckInverseClicked); - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace MonoDevelop.Profiling.HeapShot +{ + public partial class ReferenceTreeViewer + { + private global::Gtk.VBox vbox1; + + private global::Gtk.ScrolledWindow scrolledwindow1; + + private global::Gtk.TreeView treeview; + + private global::Gtk.HBox hbox1; + + private global::Gtk.HBox boxFilter; + + private global::Gtk.Entry entryFilter; + + private global::Gtk.Button buttonFilter; + + private global::Gtk.CheckButton checkInverse; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer + global::Stetic.BinContainer.Attach (this); + this.Events = ((global::Gdk.EventMask)(256)); + this.Name = "MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer"; + // Container child MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer.Gtk.Container+ContainerChild + this.vbox1 = new global::Gtk.VBox (); + this.vbox1.Name = "vbox1"; + this.vbox1.Spacing = 6; + this.vbox1.BorderWidth = ((uint)(6)); + // Container child vbox1.Gtk.Box+BoxChild + this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); + this.scrolledwindow1.CanFocus = true; + this.scrolledwindow1.Name = "scrolledwindow1"; + this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1)); + // Container child scrolledwindow1.Gtk.Container+ContainerChild + this.treeview = new global::Gtk.TreeView (); + this.treeview.CanFocus = true; + this.treeview.Events = ((global::Gdk.EventMask)(8196)); + this.treeview.Name = "treeview"; + this.scrolledwindow1.Add (this.treeview); + this.vbox1.Add (this.scrolledwindow1); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.scrolledwindow1])); + w2.Position = 0; + // Container child vbox1.Gtk.Box+BoxChild + this.hbox1 = new global::Gtk.HBox (); + this.hbox1.Name = "hbox1"; + this.hbox1.Spacing = 6; + // Container child hbox1.Gtk.Box+BoxChild + this.boxFilter = new global::Gtk.HBox (); + this.boxFilter.Name = "boxFilter"; + this.boxFilter.Spacing = 3; + // Container child boxFilter.Gtk.Box+BoxChild + this.entryFilter = new global::Gtk.Entry (); + this.entryFilter.CanFocus = true; + this.entryFilter.Name = "entryFilter"; + this.entryFilter.IsEditable = true; + this.entryFilter.InvisibleChar = '●'; + this.boxFilter.Add (this.entryFilter); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.boxFilter[this.entryFilter])); + w3.Position = 0; + // Container child boxFilter.Gtk.Box+BoxChild + this.buttonFilter = new global::Gtk.Button (); + this.buttonFilter.CanFocus = true; + this.buttonFilter.Name = "buttonFilter"; + this.buttonFilter.Label = "Filter"; + this.boxFilter.Add (this.buttonFilter); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.boxFilter[this.buttonFilter])); + w4.Position = 1; + w4.Expand = false; + w4.Fill = false; + this.hbox1.Add (this.boxFilter); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.boxFilter])); + w5.Position = 0; + // Container child hbox1.Gtk.Box+BoxChild + this.checkInverse = new global::Gtk.CheckButton (); + this.checkInverse.CanFocus = true; + this.checkInverse.Name = "checkInverse"; + this.checkInverse.Label = "Inverse references"; + this.checkInverse.DrawIndicator = true; + this.hbox1.Add (this.checkInverse); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.checkInverse])); + w6.Position = 1; + w6.Expand = false; + w6.Fill = false; + this.vbox1.Add (this.hbox1); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); + w7.Position = 1; + w7.Expand = false; + w7.Fill = false; + this.Add (this.vbox1); + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.Show (); + this.treeview.MotionNotifyEvent += new global::Gtk.MotionNotifyEventHandler (this.OnTreeviewMotionNotifyEvent); + this.treeview.LeaveNotifyEvent += new global::Gtk.LeaveNotifyEventHandler (this.OnTreeviewLeaveNotifyEvent); + this.entryFilter.Activated += new global::System.EventHandler (this.OnEntryFilterActivated); + this.buttonFilter.Clicked += new global::System.EventHandler (this.OnButtonFilterClicked); + this.checkInverse.Clicked += new global::System.EventHandler (this.OnCheckInverseClicked); + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/generated.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/generated.cs index 2fb22592af..aa96390c4a 100755 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/generated.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/generated.cs @@ -1,82 +1,82 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// Mono Runtime Version: 2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace Stetic { - - - internal class Gui { - - private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class BinContainer { - - private Gtk.Widget child; - - private Gtk.UIManager uimanager; - - public static BinContainer Attach(Gtk.Bin bin) { - BinContainer bc = new BinContainer(); - bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested); - bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated); - bin.Added += new Gtk.AddedHandler(bc.OnAdded); - return bc; - } - - private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) { - if ((this.child != null)) { - args.Requisition = this.child.SizeRequest(); - } - } - - private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) { - if ((this.child != null)) { - this.child.Allocation = args.Allocation; - } - } - - private void OnAdded(object sender, Gtk.AddedArgs args) { - this.child = args.Widget; - } - - public void SetUiManager(Gtk.UIManager uim) { - this.uimanager = uim; - this.child.Realized += new System.EventHandler(this.OnRealized); - } - - private void OnRealized(object sender, System.EventArgs args) { - if ((this.uimanager != null)) { - Gtk.Widget w; - w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) { - ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup); - this.uimanager = null; - } - } - } - } - - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup(string name) { - return null; - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace Stetic +{ + internal class Gui + { + private static bool initialized; + + static internal void Initialize (Gtk.Widget iconRenderer) + { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class BinContainer + { + private Gtk.Widget child; + + private Gtk.UIManager uimanager; + + public static BinContainer Attach (Gtk.Bin bin) + { + BinContainer bc = new BinContainer (); + bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested); + bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated); + bin.Added += new Gtk.AddedHandler (bc.OnAdded); + return bc; + } + + private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) + { + if ((this.child != null)) { + args.Requisition = this.child.SizeRequest (); + } + } + + private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) + { + if ((this.child != null)) { + this.child.Allocation = args.Allocation; + } + } + + private void OnAdded (object sender, Gtk.AddedArgs args) + { + this.child = args.Widget; + } + + public void SetUiManager (Gtk.UIManager uim) + { + this.uimanager = uim; + this.child.Realized += new System.EventHandler (this.OnRealized); + } + + private void OnRealized (object sender, System.EventArgs args) + { + if ((this.uimanager != null)) { + Gtk.Widget w; + w = this.child.Toplevel; + if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { + ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); + this.uimanager = null; + } + } + } + } + + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup (System.Type type) + { + return Stetic.ActionGroups.GetActionGroup (type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup (string name) + { + return null; + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/objects.xml b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/objects.xml index 16669269ac..2c33b19d32 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/objects.xml +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/gtk-gui/objects.xml @@ -1,15 +1,2 @@ -<objects> - <object type="MonoDevelop.Profiling.HeapShot.ReferenceTreeViewer" palette-category="MonoDevelop.Profiling.HeapShot" allow-children="false" base-type="Gtk.Bin"> - <itemgroups> - <itemgroup label="ReferenceTreeViewer Properties"> - <property name="InverseReferences" /> - </itemgroup> - </itemgroups> - <signals> - <itemgroup label="ReferenceTreeViewer Signals"> - <signal name="ProgressEvent" /> - <signal name="TypeActivated" /> - </itemgroup> - </signals> - </object> +<objects attr-sync="on"> </objects>
\ No newline at end of file diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.mds b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.mds index 1d929c07aa..c0ca272b6b 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.mds +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling.mds @@ -1,4 +1,8 @@ <Combine fileversion="2.0"> + <Policies> + <VersionControlPolicy inheritsSet="Mono" /> + <ChangeLogPolicy UpdateMode="Nearest" inheritsSet="Mono" /> + </Policies> <Configurations active="Debug"> <Configuration name="Debug" ctype="CombineConfiguration"> <Entry build="True" name="MonoDevelop.Profiling" configuration="Debug" /> diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/AbstractProfiler.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/AbstractProfiler.cs index 24c78b4507..11421fe8a2 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/AbstractProfiler.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/AbstractProfiler.cs @@ -32,7 +32,7 @@ using System.Diagnostics; using System.Collections.Generic; using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; namespace MonoDevelop.Profiling { diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ChangeLog b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ChangeLog index 9a79f93753..02d01c0cd4 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ChangeLog +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ChangeLog @@ -1,3 +1,23 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * gtk-gui/gui.stetic: + * ProfilingContext.cs: + * ProfilingService.cs: + * AbstractProfiler.cs: + * gtk-gui/generated.cs: + * ProfilingOperations.cs: + * Commands/PadCommands.cs: + * Commands/ToolCommands.cs: + * MonoDevelop.Profiling.mdp: + * Commands/ProjectCommands.cs: + * Dialogs/SelectProcessDialog.cs: + * MonoDevelop.Profiling.addin.xml: + * Commands/AbstractProfilerList.cs: + * gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs: + * gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs: + Merged MD.Projects into MD.Core, and MD.Projects.Gui, + MD.Core.Gui and MD.Components into MD.Ide. + 2009-10-30 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Profiling.addin.xml: Bump MD version. diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/AbstractProfilerList.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/AbstractProfilerList.cs index f58f59f0de..d4480e9e45 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/AbstractProfilerList.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/AbstractProfilerList.cs @@ -30,9 +30,8 @@ using System.Threading; using System.Diagnostics; using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; using MonoDevelop.Components; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; using MonoDevelop.Components.Commands; namespace MonoDevelop.Profiling diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/PadCommands.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/PadCommands.cs index 01421f421d..c65deef07c 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/PadCommands.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/PadCommands.cs @@ -28,7 +28,7 @@ using Gtk; using System; using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Components.Commands; namespace MonoDevelop.Profiling diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ProjectCommands.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ProjectCommands.cs index ef8ca7cc07..07ec916425 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ProjectCommands.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ProjectCommands.cs @@ -30,9 +30,10 @@ using System.Threading; using System.Diagnostics; using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; + using MonoDevelop.Projects; using MonoDevelop.Components; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Components.Commands; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ToolCommands.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ToolCommands.cs index 1f14d0532e..3c0e4770c2 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ToolCommands.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Commands/ToolCommands.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Diagnostics; using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; + using MonoDevelop.Projects; using MonoDevelop.Components; using MonoDevelop.Ide.Gui; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Dialogs/SelectProcessDialog.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Dialogs/SelectProcessDialog.cs index 269a12dbad..8702e24954 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Dialogs/SelectProcessDialog.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Dialogs/SelectProcessDialog.cs @@ -28,7 +28,7 @@ using Gtk; using System; using System.Diagnostics; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; namespace MonoDevelop.Profiling { diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml index c8348e6387..7b1be37999 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml @@ -14,7 +14,6 @@ <Dependencies> <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> <Addin id="Ide" version="2.2"/> </Dependencies> diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.mdp b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.mdp index ed9d06e43a..0a2640d886 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.mdp +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.mdp @@ -1,64 +1,70 @@ -<Project name="MonoDevelop.Profiling" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> +<Project name="MonoDevelop.Profiling" fileversion="2.0" DefaultNamespace="MonoDevelop.Profiling" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar /> + <ResourcesVar Sync="True" Name="RES" /> + <OthersVar /> + <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> + <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> + </MonoDevelop.Autotools.MakefileInfo> <Configurations active="Debug"> <Configuration name="Debug" ctype="DotNetProjectConfiguration"> <Output directory="../build" assembly="MonoDevelop.Profiling" /> <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="../build" assemblyKeyFile="." assembly="MonoDevelop.Profiling" /> + <Output directory="../build" assembly="MonoDevelop.Profiling" assemblyKeyFile="." /> <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> + <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> </Configuration> </Configurations> <Contents> - <File name="AbstractProfiler.cs" subtype="Code" buildaction="Compile" /> - <File name="AbstractProfilerSnapshot.cs" subtype="Code" buildaction="Compile" /> - <File name="DummyProcessAsyncOperation.cs" subtype="Code" buildaction="Compile" /> - <File name="IProfiler.cs" subtype="Code" buildaction="Compile" /> - <File name="IProfilingSnapshot.cs" subtype="Code" buildaction="Compile" /> - <File name="MonoProfilerExecutionHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="ProcessProfilerExecutionHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilerEventArgs.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilerState.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilerStateEventArgs.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilingContext.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilingOperations.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilingService.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilingSnapshotCollection.cs" subtype="Code" buildaction="Compile" /> - <File name="ProfilingSnapshotEventArgs.cs" subtype="Code" buildaction="Compile" /> - <File name="MonoDevelop.Profiling.addin.xml" subtype="Code" buildaction="EmbedAsResource" /> - <File name="icons/Icons.16x16.Profiling.Filter.png" subtype="Code" buildaction="EmbedAsResource" /> - <File name="icons/Icons.16x16.Profiling.GC.png" subtype="Code" buildaction="EmbedAsResource" /> - <File name="icons/Icons.16x16.Profiling.History.png" subtype="Code" buildaction="EmbedAsResource" /> - <File name="icons/Icons.16x16.Profiling.Snapshot.png" subtype="Code" buildaction="EmbedAsResource" /> - <File name="icons/Icons.16x16.Profiling.Summary.png" subtype="Code" buildaction="EmbedAsResource" /> - <File name="Codons/ProfilerCodon.cs" subtype="Code" buildaction="Compile" /> - <File name="Commands/AbstractProfilerList.cs" subtype="Code" buildaction="Compile" /> - <File name="Commands/PadCommands.cs" subtype="Code" buildaction="Compile" /> - <File name="Commands/ProjectCommands.cs" subtype="Code" buildaction="Compile" /> - <File name="Commands/ToolCommands.cs" subtype="Code" buildaction="Compile" /> - <File name="Dialogs/SelectExecutableDialog.cs" subtype="Code" buildaction="Compile" /> - <File name="Dialogs/SelectProcessDialog.cs" subtype="Code" buildaction="Compile" /> - <File name="Pads/ProfilingPad.cs" subtype="Code" buildaction="Compile" /> - <File name="Pads/ProfilingSnapshotCollectionNodeBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" /> - <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" /> - <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" /> - <File name="gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs" subtype="Code" buildaction="Compile" /> - <File name="gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs" subtype="Code" buildaction="Compile" /> - <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> + <File subtype="Code" buildaction="Compile" name="AbstractProfiler.cs" /> + <File subtype="Code" buildaction="Compile" name="AbstractProfilerSnapshot.cs" /> + <File subtype="Code" buildaction="Compile" name="DummyProcessAsyncOperation.cs" /> + <File subtype="Code" buildaction="Compile" name="IProfiler.cs" /> + <File subtype="Code" buildaction="Compile" name="IProfilingSnapshot.cs" /> + <File subtype="Code" buildaction="Compile" name="MonoProfilerExecutionHandler.cs" /> + <File subtype="Code" buildaction="Compile" name="ProcessProfilerExecutionHandler.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilerEventArgs.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilerState.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilerStateEventArgs.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilingContext.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilingOperations.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilingService.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilingSnapshotCollection.cs" /> + <File subtype="Code" buildaction="Compile" name="ProfilingSnapshotEventArgs.cs" /> + <File subtype="Code" buildaction="EmbedAsResource" name="MonoDevelop.Profiling.addin.xml" /> + <File subtype="Code" buildaction="EmbedAsResource" name="icons/Icons.16x16.Profiling.Filter.png" /> + <File subtype="Code" buildaction="EmbedAsResource" name="icons/Icons.16x16.Profiling.GC.png" /> + <File subtype="Code" buildaction="EmbedAsResource" name="icons/Icons.16x16.Profiling.History.png" /> + <File subtype="Code" buildaction="EmbedAsResource" name="icons/Icons.16x16.Profiling.Snapshot.png" /> + <File subtype="Code" buildaction="EmbedAsResource" name="icons/Icons.16x16.Profiling.Summary.png" /> + <File subtype="Code" buildaction="Compile" name="Codons/ProfilerCodon.cs" /> + <File subtype="Code" buildaction="Compile" name="Commands/AbstractProfilerList.cs" /> + <File subtype="Code" buildaction="Compile" name="Commands/PadCommands.cs" /> + <File subtype="Code" buildaction="Compile" name="Commands/ProjectCommands.cs" /> + <File subtype="Code" buildaction="Compile" name="Commands/ToolCommands.cs" /> + <File subtype="Code" buildaction="Compile" name="Dialogs/SelectExecutableDialog.cs" /> + <File subtype="Code" buildaction="Compile" name="Dialogs/SelectProcessDialog.cs" /> + <File subtype="Code" buildaction="Compile" name="Pads/ProfilingPad.cs" /> + <File subtype="Code" buildaction="Compile" name="Pads/ProfilingSnapshotCollectionNodeBuilder.cs" /> + <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" /> + <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/objects.xml" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs" /> + <File subtype="Code" buildaction="Compile" name="gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs" /> + <File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" /> </Contents> <References> <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects, Version=0.18.0.0, Culture=neutral" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Components, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core.Gui, Version=0.18.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.DesignerSupport, Version=0.0.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> @@ -81,19 +87,16 @@ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.XmlEditor, Version=0.6.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> - <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects.Gui, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.SourceEditor2, Version=2.1.0.0, Culture=neutral" /> <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Debugger, Version=2.1.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Moonlight, Version=2.2.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugger.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging.Soft, Version=0.0.0.0, Culture=neutral, PublicKeyToken=1968fe265398bfbb" /> + <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=43ec5927c50c544e" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Core,2.2" refto="MonoDevelop.Core,2.2" ctype="AddinReference" /> + <ProjectReference type="Custom" localcopy="True" Include="MonoDevelop.Ide,2.2" refto="MonoDevelop.Ide,2.2" ctype="AddinReference" /> </References> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> - <BuildFilesVar Sync="True" Name="FILES" /> - <DeployFilesVar /> - <ResourcesVar Sync="True" Name="RES" /> - <OthersVar /> - <GacRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> - <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> - </MonoDevelop.Autotools.MakefileInfo> </Project>
\ No newline at end of file diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ChangeLog b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ChangeLog index 8028d6442b..41d5784d69 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ChangeLog +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ChangeLog @@ -1,3 +1,10 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * ProfilingPad.cs: + * ProfilingSnapshotCollectionNodeBuilder.cs: Merged + MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui + and MD.Components into MD.Ide. + 2009-07-24 Lluis Sanchez Gual <lluis@novell.com> * ProfilingPad.cs: Track api changes. diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingPad.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingPad.cs index c285a61261..ed9ddc92bd 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingPad.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingPad.cs @@ -29,7 +29,7 @@ using System; using System.Resources; using MonoDevelop.Core; -using Stock = MonoDevelop.Core.Gui.Stock; +using Stock = MonoDevelop.Ide.Gui.Stock; using MonoDevelop.Core.Execution; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingSnapshotCollectionNodeBuilder.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingSnapshotCollectionNodeBuilder.cs index ee90002c37..9907ecbdee 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingSnapshotCollectionNodeBuilder.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/Pads/ProfilingSnapshotCollectionNodeBuilder.cs @@ -24,14 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using Gtk; using System; -using System.Threading; using MonoDevelop.Core; -using MonoDevelop.Components.Commands; -using MonoDevelop.Core.Gui; -using MonoDevelop.Ide.Gui.Pads; using MonoDevelop.Ide.Gui.Components; +using MonoDevelop.Ide; namespace MonoDevelop.Profiling { diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingContext.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingContext.cs index d1858b4897..04ce8ec241 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingContext.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingContext.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using MonoDevelop.Core; using MonoDevelop.Core.AddIns; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui; using MonoDevelop.Projects; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingOperations.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingOperations.cs index 993a541d4b..99a158fba0 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingOperations.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingOperations.cs @@ -30,8 +30,8 @@ using System.Diagnostics; using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Core.Gui.ProgressMonitoring; +using MonoDevelop.Ide; +using MonoDevelop.Ide.ProgressMonitoring; using MonoDevelop.Core.AddIns; using MonoDevelop.Core.Execution; using MonoDevelop.Core.ProgressMonitoring; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingService.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingService.cs index a229864865..7529a6637e 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingService.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/ProfilingService.cs @@ -33,7 +33,7 @@ using Mono.Addins; using MonoDevelop.Core; using MonoDevelop.Core.AddIns; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Gui.Dialogs; diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs index 47b3140341..4ee02abc45 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectExecutableDialog.cs @@ -1,177 +1,168 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace MonoDevelop.Profiling { - - - public partial class SelectExecutableDialog { - - private Gtk.Table table; - - private Gtk.Button buttonOpen; - - private Gtk.ComboBox comboProfilers; - - private Gtk.Entry entryArguments; - - private Gtk.Entry entryExecutable; - - private Gtk.Label label1; - - private Gtk.Label label2; - - private Gtk.Label label3; - - private Gtk.Button buttonCancel; - - private Gtk.Button buttonOk; - - protected virtual void Build() { - Stetic.Gui.Initialize(this); - // Widget MonoDevelop.Profiling.SelectExecutableDialog - this.Name = "MonoDevelop.Profiling.SelectExecutableDialog"; - this.Title = Mono.Unix.Catalog.GetString("Select Executable"); - this.WindowPosition = ((Gtk.WindowPosition)(4)); - this.HasSeparator = false; - // Internal child MonoDevelop.Profiling.SelectExecutableDialog.VBox - Gtk.VBox w1 = this.VBox; - w1.Name = "dialog1_VBox"; - w1.BorderWidth = ((uint)(2)); - // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table = new Gtk.Table(((uint)(3)), ((uint)(3)), false); - this.table.Name = "table"; - this.table.RowSpacing = ((uint)(6)); - this.table.ColumnSpacing = ((uint)(6)); - // Container child table.Gtk.Table+TableChild - this.buttonOpen = new Gtk.Button(); - this.buttonOpen.CanFocus = true; - this.buttonOpen.Name = "buttonOpen"; - this.buttonOpen.UseStock = true; - this.buttonOpen.UseUnderline = true; - this.buttonOpen.Label = "gtk-open"; - this.table.Add(this.buttonOpen); - Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table[this.buttonOpen])); - w2.LeftAttach = ((uint)(2)); - w2.RightAttach = ((uint)(3)); - w2.XOptions = ((Gtk.AttachOptions)(4)); - w2.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.comboProfilers = Gtk.ComboBox.NewText(); - this.comboProfilers.Name = "comboProfilers"; - this.table.Add(this.comboProfilers); - Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table[this.comboProfilers])); - w3.TopAttach = ((uint)(2)); - w3.BottomAttach = ((uint)(3)); - w3.LeftAttach = ((uint)(1)); - w3.RightAttach = ((uint)(3)); - w3.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.entryArguments = new Gtk.Entry(); - this.entryArguments.CanFocus = true; - this.entryArguments.Name = "entryArguments"; - this.entryArguments.IsEditable = true; - this.entryArguments.InvisibleChar = '●'; - this.table.Add(this.entryArguments); - Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table[this.entryArguments])); - w4.TopAttach = ((uint)(1)); - w4.BottomAttach = ((uint)(2)); - w4.LeftAttach = ((uint)(1)); - w4.RightAttach = ((uint)(3)); - w4.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.entryExecutable = new Gtk.Entry(); - this.entryExecutable.CanFocus = true; - this.entryExecutable.Name = "entryExecutable"; - this.entryExecutable.IsEditable = true; - this.entryExecutable.InvisibleChar = '●'; - this.table.Add(this.entryExecutable); - Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table[this.entryExecutable])); - w5.LeftAttach = ((uint)(1)); - w5.RightAttach = ((uint)(2)); - w5.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.label1 = new Gtk.Label(); - this.label1.Name = "label1"; - this.label1.Xalign = 0F; - this.label1.LabelProp = Mono.Unix.Catalog.GetString("Executable"); - this.table.Add(this.label1); - Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table[this.label1])); - w6.XOptions = ((Gtk.AttachOptions)(4)); - w6.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.label2 = new Gtk.Label(); - this.label2.Name = "label2"; - this.label2.Xalign = 0F; - this.label2.LabelProp = Mono.Unix.Catalog.GetString("Arguments"); - this.table.Add(this.label2); - Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table[this.label2])); - w7.TopAttach = ((uint)(1)); - w7.BottomAttach = ((uint)(2)); - w7.XOptions = ((Gtk.AttachOptions)(4)); - w7.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table.Gtk.Table+TableChild - this.label3 = new Gtk.Label(); - this.label3.Name = "label3"; - this.label3.Xalign = 0F; - this.label3.LabelProp = Mono.Unix.Catalog.GetString("Profiler"); - this.table.Add(this.label3); - Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table[this.label3])); - w8.TopAttach = ((uint)(2)); - w8.BottomAttach = ((uint)(3)); - w8.XOptions = ((Gtk.AttachOptions)(4)); - w8.YOptions = ((Gtk.AttachOptions)(4)); - w1.Add(this.table); - Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(w1[this.table])); - w9.Position = 0; - w9.Expand = false; - w9.Fill = false; - // Internal child MonoDevelop.Profiling.SelectExecutableDialog.ActionArea - Gtk.HButtonBox w10 = this.ActionArea; - w10.Name = "dialog1_ActionArea"; - w10.Spacing = 6; - w10.BorderWidth = ((uint)(5)); - w10.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonCancel = new Gtk.Button(); - this.buttonCancel.CanDefault = true; - this.buttonCancel.CanFocus = true; - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.UseStock = true; - this.buttonCancel.UseUnderline = true; - this.buttonCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.buttonCancel, -6); - Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonCancel])); - w11.Expand = false; - w11.Fill = false; - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonOk = new Gtk.Button(); - this.buttonOk.Sensitive = false; - this.buttonOk.CanDefault = true; - this.buttonOk.CanFocus = true; - this.buttonOk.Name = "buttonOk"; - this.buttonOk.UseStock = true; - this.buttonOk.UseUnderline = true; - this.buttonOk.Label = "gtk-ok"; - this.AddActionWidget(this.buttonOk, -5); - Gtk.ButtonBox.ButtonBoxChild w12 = ((Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonOk])); - w12.Position = 1; - w12.Expand = false; - w12.Fill = false; - if ((this.Child != null)) { - this.Child.ShowAll(); - } - this.DefaultWidth = 488; - this.DefaultHeight = 185; - this.Show(); - this.entryExecutable.Changed += new System.EventHandler(this.ExecutableChanged); - this.buttonOpen.Clicked += new System.EventHandler(this.OpenClicked); - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace MonoDevelop.Profiling +{ + public partial class SelectExecutableDialog + { + private global::Gtk.Table table; + + private global::Gtk.Button buttonOpen; + + private global::Gtk.ComboBox comboProfilers; + + private global::Gtk.Entry entryArguments; + + private global::Gtk.Entry entryExecutable; + + private global::Gtk.Label label1; + + private global::Gtk.Label label2; + + private global::Gtk.Label label3; + + private global::Gtk.Button buttonCancel; + + private global::Gtk.Button buttonOk; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget MonoDevelop.Profiling.SelectExecutableDialog + this.Name = "MonoDevelop.Profiling.SelectExecutableDialog"; + this.Title = global::Mono.Unix.Catalog.GetString ("Select Executable"); + this.WindowPosition = ((global::Gtk.WindowPosition)(4)); + // Internal child MonoDevelop.Profiling.SelectExecutableDialog.VBox + global::Gtk.VBox w1 = this.VBox; + w1.Name = "dialog1_VBox"; + w1.BorderWidth = ((uint)(2)); + // Container child dialog1_VBox.Gtk.Box+BoxChild + this.table = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false); + this.table.Name = "table"; + this.table.RowSpacing = ((uint)(6)); + this.table.ColumnSpacing = ((uint)(6)); + // Container child table.Gtk.Table+TableChild + this.buttonOpen = new global::Gtk.Button (); + this.buttonOpen.CanFocus = true; + this.buttonOpen.Name = "buttonOpen"; + this.buttonOpen.UseStock = true; + this.buttonOpen.UseUnderline = true; + this.buttonOpen.Label = "gtk-open"; + this.table.Add (this.buttonOpen); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table[this.buttonOpen])); + w2.LeftAttach = ((uint)(2)); + w2.RightAttach = ((uint)(3)); + w2.XOptions = ((global::Gtk.AttachOptions)(4)); + w2.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.comboProfilers = global::Gtk.ComboBox.NewText (); + this.comboProfilers.Name = "comboProfilers"; + this.table.Add (this.comboProfilers); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table[this.comboProfilers])); + w3.TopAttach = ((uint)(2)); + w3.BottomAttach = ((uint)(3)); + w3.LeftAttach = ((uint)(1)); + w3.RightAttach = ((uint)(3)); + w3.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.entryArguments = new global::Gtk.Entry (); + this.entryArguments.CanFocus = true; + this.entryArguments.Name = "entryArguments"; + this.entryArguments.IsEditable = true; + this.entryArguments.InvisibleChar = '●'; + this.table.Add (this.entryArguments); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table[this.entryArguments])); + w4.TopAttach = ((uint)(1)); + w4.BottomAttach = ((uint)(2)); + w4.LeftAttach = ((uint)(1)); + w4.RightAttach = ((uint)(3)); + w4.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.entryExecutable = new global::Gtk.Entry (); + this.entryExecutable.CanFocus = true; + this.entryExecutable.Name = "entryExecutable"; + this.entryExecutable.IsEditable = true; + this.entryExecutable.InvisibleChar = '●'; + this.table.Add (this.entryExecutable); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table[this.entryExecutable])); + w5.LeftAttach = ((uint)(1)); + w5.RightAttach = ((uint)(2)); + w5.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.Xalign = 0f; + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Executable"); + this.table.Add (this.label1); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table[this.label1])); + w6.XOptions = ((global::Gtk.AttachOptions)(4)); + w6.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.label2 = new global::Gtk.Label (); + this.label2.Name = "label2"; + this.label2.Xalign = 0f; + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Arguments"); + this.table.Add (this.label2); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table[this.label2])); + w7.TopAttach = ((uint)(1)); + w7.BottomAttach = ((uint)(2)); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table.Gtk.Table+TableChild + this.label3 = new global::Gtk.Label (); + this.label3.Name = "label3"; + this.label3.Xalign = 0f; + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Profiler"); + this.table.Add (this.label3); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table[this.label3])); + w8.TopAttach = ((uint)(2)); + w8.BottomAttach = ((uint)(3)); + w8.XOptions = ((global::Gtk.AttachOptions)(4)); + w8.YOptions = ((global::Gtk.AttachOptions)(4)); + w1.Add (this.table); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1[this.table])); + w9.Position = 0; + w9.Expand = false; + w9.Fill = false; + // Internal child MonoDevelop.Profiling.SelectExecutableDialog.ActionArea + global::Gtk.HButtonBox w10 = this.ActionArea; + w10.Name = "dialog1_ActionArea"; + w10.Spacing = 6; + w10.BorderWidth = ((uint)(5)); + w10.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonCancel = new global::Gtk.Button (); + this.buttonCancel.CanDefault = true; + this.buttonCancel.CanFocus = true; + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.UseStock = true; + this.buttonCancel.UseUnderline = true; + this.buttonCancel.Label = "gtk-cancel"; + this.AddActionWidget (this.buttonCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonCancel])); + w11.Expand = false; + w11.Fill = false; + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonOk = new global::Gtk.Button (); + this.buttonOk.Sensitive = false; + this.buttonOk.CanDefault = true; + this.buttonOk.CanFocus = true; + this.buttonOk.Name = "buttonOk"; + this.buttonOk.UseStock = true; + this.buttonOk.UseUnderline = true; + this.buttonOk.Label = "gtk-ok"; + this.AddActionWidget (this.buttonOk, -5); + global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.buttonOk])); + w12.Position = 1; + w12.Expand = false; + w12.Fill = false; + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.DefaultWidth = 488; + this.DefaultHeight = 185; + this.Show (); + this.entryExecutable.Changed += new global::System.EventHandler (this.ExecutableChanged); + this.buttonOpen.Clicked += new global::System.EventHandler (this.OpenClicked); + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs index f9527fc817..c49af5f26a 100644 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/MonoDevelop.Profiling.SelectProcessDialog.cs @@ -1,111 +1,102 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace MonoDevelop.Profiling { - - - public partial class SelectProcessDialog { - - private Gtk.VBox vbox1; - - private Gtk.Label label1; - - private Gtk.ScrolledWindow scrolledwindow1; - - private Gtk.TreeView list; - - private Gtk.Button buttonCancel; - - private Gtk.Button buttonOk; - - protected virtual void Build() { - Stetic.Gui.Initialize(this); - // Widget MonoDevelop.Profiling.SelectProcessDialog - this.Name = "MonoDevelop.Profiling.SelectProcessDialog"; - this.Title = Mono.Unix.Catalog.GetString("Select process"); - this.TypeHint = ((Gdk.WindowTypeHint)(1)); - this.WindowPosition = ((Gtk.WindowPosition)(4)); - this.HasSeparator = false; - // Internal child MonoDevelop.Profiling.SelectProcessDialog.VBox - Gtk.VBox w1 = this.VBox; - w1.Name = "dialog1_VBox"; - w1.BorderWidth = ((uint)(2)); - // Container child dialog1_VBox.Gtk.Box+BoxChild - this.vbox1 = new Gtk.VBox(); - this.vbox1.Name = "vbox1"; - this.vbox1.Spacing = 6; - this.vbox1.BorderWidth = ((uint)(12)); - // Container child vbox1.Gtk.Box+BoxChild - this.label1 = new Gtk.Label(); - this.label1.Name = "label1"; - this.label1.Xalign = 0F; - this.label1.LabelProp = "Select a process:"; - this.vbox1.Add(this.label1); - Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox1[this.label1])); - w2.Position = 0; - w2.Expand = false; - w2.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.scrolledwindow1 = new Gtk.ScrolledWindow(); - this.scrolledwindow1.CanFocus = true; - this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); - // Container child scrolledwindow1.Gtk.Container+ContainerChild - this.list = new Gtk.TreeView(); - this.list.CanFocus = true; - this.list.Name = "list"; - this.scrolledwindow1.Add(this.list); - this.vbox1.Add(this.scrolledwindow1); - Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox1[this.scrolledwindow1])); - w4.Position = 1; - w1.Add(this.vbox1); - Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(w1[this.vbox1])); - w5.Position = 0; - // Internal child MonoDevelop.Profiling.SelectProcessDialog.ActionArea - Gtk.HButtonBox w6 = this.ActionArea; - w6.Name = "dialog1_ActionArea"; - w6.Spacing = 6; - w6.BorderWidth = ((uint)(5)); - w6.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonCancel = new Gtk.Button(); - this.buttonCancel.CanDefault = true; - this.buttonCancel.CanFocus = true; - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.UseStock = true; - this.buttonCancel.UseUnderline = true; - this.buttonCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.buttonCancel, -6); - Gtk.ButtonBox.ButtonBoxChild w7 = ((Gtk.ButtonBox.ButtonBoxChild)(w6[this.buttonCancel])); - w7.Expand = false; - w7.Fill = false; - // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.buttonOk = new Gtk.Button(); - this.buttonOk.Sensitive = false; - this.buttonOk.CanDefault = true; - this.buttonOk.CanFocus = true; - this.buttonOk.Name = "buttonOk"; - this.buttonOk.UseStock = true; - this.buttonOk.UseUnderline = true; - this.buttonOk.Label = "gtk-ok"; - this.AddActionWidget(this.buttonOk, -5); - Gtk.ButtonBox.ButtonBoxChild w8 = ((Gtk.ButtonBox.ButtonBoxChild)(w6[this.buttonOk])); - w8.Position = 1; - w8.Expand = false; - w8.Fill = false; - if ((this.Child != null)) { - this.Child.ShowAll(); - } - this.DefaultWidth = 582; - this.DefaultHeight = 313; - this.Show(); - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace MonoDevelop.Profiling +{ + public partial class SelectProcessDialog + { + private global::Gtk.VBox vbox1; + + private global::Gtk.Label label1; + + private global::Gtk.ScrolledWindow scrolledwindow1; + + private global::Gtk.TreeView list; + + private global::Gtk.Button buttonCancel; + + private global::Gtk.Button buttonOk; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget MonoDevelop.Profiling.SelectProcessDialog + this.Name = "MonoDevelop.Profiling.SelectProcessDialog"; + this.Title = global::Mono.Unix.Catalog.GetString ("Select process"); + this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); + this.WindowPosition = ((global::Gtk.WindowPosition)(4)); + // Internal child MonoDevelop.Profiling.SelectProcessDialog.VBox + global::Gtk.VBox w1 = this.VBox; + w1.Name = "dialog1_VBox"; + w1.BorderWidth = ((uint)(2)); + // Container child dialog1_VBox.Gtk.Box+BoxChild + this.vbox1 = new global::Gtk.VBox (); + this.vbox1.Name = "vbox1"; + this.vbox1.Spacing = 6; + this.vbox1.BorderWidth = ((uint)(12)); + // Container child vbox1.Gtk.Box+BoxChild + this.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.Xalign = 0f; + this.label1.LabelProp = "Select a process:"; + this.vbox1.Add (this.label1); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label1])); + w2.Position = 0; + w2.Expand = false; + w2.Fill = false; + // Container child vbox1.Gtk.Box+BoxChild + this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); + this.scrolledwindow1.CanFocus = true; + this.scrolledwindow1.Name = "scrolledwindow1"; + this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1)); + // Container child scrolledwindow1.Gtk.Container+ContainerChild + this.list = new global::Gtk.TreeView (); + this.list.CanFocus = true; + this.list.Name = "list"; + this.scrolledwindow1.Add (this.list); + this.vbox1.Add (this.scrolledwindow1); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.scrolledwindow1])); + w4.Position = 1; + w1.Add (this.vbox1); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1[this.vbox1])); + w5.Position = 0; + // Internal child MonoDevelop.Profiling.SelectProcessDialog.ActionArea + global::Gtk.HButtonBox w6 = this.ActionArea; + w6.Name = "dialog1_ActionArea"; + w6.Spacing = 6; + w6.BorderWidth = ((uint)(5)); + w6.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonCancel = new global::Gtk.Button (); + this.buttonCancel.CanDefault = true; + this.buttonCancel.CanFocus = true; + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.UseStock = true; + this.buttonCancel.UseUnderline = true; + this.buttonCancel.Label = "gtk-cancel"; + this.AddActionWidget (this.buttonCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6[this.buttonCancel])); + w7.Expand = false; + w7.Fill = false; + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonOk = new global::Gtk.Button (); + this.buttonOk.Sensitive = false; + this.buttonOk.CanDefault = true; + this.buttonOk.CanFocus = true; + this.buttonOk.Name = "buttonOk"; + this.buttonOk.UseStock = true; + this.buttonOk.UseUnderline = true; + this.buttonOk.Label = "gtk-ok"; + this.AddActionWidget (this.buttonOk, -5); + global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w6[this.buttonOk])); + w8.Position = 1; + w8.Expand = false; + w8.Fill = false; + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.DefaultWidth = 582; + this.DefaultHeight = 313; + this.Show (); + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/generated.cs b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/generated.cs index 8b467a5a2f..8463caae89 100755 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/generated.cs +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/generated.cs @@ -1,35 +1,29 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ -namespace Stetic { - - - internal class Gui { - - private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup(string name) { - return null; - } - } +// This file has been generated by the GUI designer. Do not modify. +namespace Stetic +{ + internal class Gui + { + private static bool initialized; + + static internal void Initialize (Gtk.Widget iconRenderer) + { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup (System.Type type) + { + return Stetic.ActionGroups.GetActionGroup (type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup (string name) + { + return null; + } + } } diff --git a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/gui.stetic b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/gui.stetic index 7232bc074d..4c9ff676b1 100755 --- a/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/gui.stetic +++ b/extras/MonoDevelop.Profiling/MonoDevelop.Profiling/gtk-gui/gui.stetic @@ -2,11 +2,32 @@ <stetic-interface> <configuration> <images-root-path>..</images-root-path> - <target-gtk-version>2.10.2</target-gtk-version> + <target-gtk-version>2.8</target-gtk-version> </configuration> <import> - <widget-library name="MonoDevelop.Ide, Version=0.18.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Components, Version=0.18.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Ide, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Components, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Core.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VersionControl, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.NUnit, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Gettext, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment.Linux, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.GtkCore, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VBNetBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CSharpBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Autotools, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.XmlEditor, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Projects.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.SourceEditor2, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Moonlight, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> <widget-library name="../../build/MonoDevelop.Profiling.dll" internal="true" /> </import> <widget class="Gtk.Dialog" id="MonoDevelop.Profiling.SelectProcessDialog" design-size="582 313"> @@ -16,7 +37,6 @@ <property name="WindowPosition">CenterOnParent</property> <property name="Buttons">2</property> <property name="HelpButton">False</property> - <property name="HasSeparator">False</property> <child internal-child="VBox"> <widget class="Gtk.VBox" id="dialog1_VBox"> <property name="MemberName" /> @@ -48,7 +68,6 @@ <widget class="Gtk.TreeView" id="list"> <property name="MemberName">list</property> <property name="CanFocus">True</property> - <property name="HeadersClickable">True</property> </widget> </child> </widget> |