mono
/
mail-archives
зеркало из https://github.com/mono/mail-archives.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
mail-archives/monodevelop-patches-list/2004-March/000730.html

276 строки
11 KiB
HTML
Исходник Постоянная ссылка Ответственный История

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Monodevelop-patches-list] r1125 - in trunk/MonoDevelop: . build/AddIns src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/Main/Base src/Main/Base/Commands src/Main/Base/Gui/Workbench src/Main/Base/Services
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1125%20-%20in%20trunk/MonoDevelop%3A%20.%20build/AddIns%20src/AddIns/DisplayBindings/SourceEditor/Gui/Pads%20src/Main/Base%20src/Main/Base/Commands%20src/Main/Base/Gui/Workbench%20src/Main/Base/Services&In-Reply-To=">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="000729.html">
<LINK REL="Next" HREF="000731.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Monodevelop-patches-list] r1125 - in trunk/MonoDevelop: . build/AddIns src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/Main/Base src/Main/Base/Commands src/Main/Base/Gui/Workbench src/Main/Base/Services</H1>
<B>commit-watcher at mono-cvs.ximian.com</B>
<A HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1125%20-%20in%20trunk/MonoDevelop%3A%20.%20build/AddIns%20src/AddIns/DisplayBindings/SourceEditor/Gui/Pads%20src/Main/Base%20src/Main/Base/Commands%20src/Main/Base/Gui/Workbench%20src/Main/Base/Services&In-Reply-To="
TITLE="[Monodevelop-patches-list] r1125 - in trunk/MonoDevelop: . build/AddIns src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/Main/Base src/Main/Base/Commands src/Main/Base/Gui/Workbench src/Main/Base/Services">commit-watcher at mono-cvs.ximian.com
</A><BR>
<I>Sat Mar 6 11:17:38 EST 2004</I>
<P><UL>
<LI>Previous message: <A HREF="000729.html">[Monodevelop-patches-list] r1124 - trunk/MonoDevelop/src/Main/Base/Services
</A></li>
<LI>Next message: <A HREF="000731.html">[Monodevelop-patches-list] r1126 - in trunk/MonoDevelop: . build src/AddIns/DisplayBindings/SourceEditor/Properties src/Main/Base/Gui/Workbench
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#730">[ date ]</a>
<a href="thread.html#730">[ thread ]</a>
<a href="subject.html#730">[ subject ]</a>
<a href="author.html#730">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Author: martin
Date: 2004-03-06 11:17:38 -0500 (Sat, 06 Mar 2004)
New Revision: 1125
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs
trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
trunk/MonoDevelop/src/Main/Base/Makefile.am
trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
Log:
2004-03-06 Martin Baulig &lt;<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">martin at ximian.com</A>&gt;
* configure.in: AC_SUBST(debugger_prefix).
* src/Main/Base/Services/Makefile.am: Use full path name for Mono.Debugger.dll.
* src/Main/Base/Gui/Workbench/DefaultWorkbench.cs: connect to the
debugger's StoppedEvent.
* src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs:
connect to the debugger's ResumedEvent and StoppedEvent.
* Main/Base/Commands/DebuggerCommands.cs: added KillApplication
and hook it to the DebuggingService.
* build/AddIns/SharpDevelopCore.addin: added menu item to the
debugging menu to kill the application.
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/ChangeLog 2004-03-06 16:17:38 UTC (rev 1125)
@@ -1,3 +1,18 @@
+2004-03-06 Martin Baulig &lt;<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">martin at ximian.com</A>&gt;
+
+ * configure.in: AC_SUBST(debugger_prefix).
+ * src/Main/Base/Services/Makefile.am: Use full path name for Mono.Debugger.dll.
+
+ * src/Main/Base/Gui/Workbench/DefaultWorkbench.cs: connect to the
+ debugger's StoppedEvent.
+ * src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs:
+ connect to the debugger's ResumedEvent and StoppedEvent.
+
+ * Main/Base/Commands/DebuggerCommands.cs: added KillApplication
+ and hook it to the DebuggingService.
+ * build/AddIns/SharpDevelopCore.addin: added menu item to the
+ debugging menu to kill the application.
+
2004-03-05 John BouAntoun &lt;<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">jba-mono at optusnet.com.au</A>&gt;
* src/Main/Base/Gui/Components/OpenFileTab.cs : deleted (duplicates TabLabel)
Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-03-06 16:17:38 UTC (rev 1125)
@@ -800,6 +800,10 @@
shortcut = &quot;Control|F8&quot;
class = &quot;MonoDevelop.Commands.ToggleRunning&quot;/&gt;
+ &lt;MenuItem id = &quot;DebugKillApplication&quot;
+ label = &quot;Kill Application&quot;
+ class = &quot;MonoDevelop.Commands.KillApplication&quot;/&gt;
+
&lt;MenuItem id = &quot;DebugSep1&quot; label = &quot;-&quot; /&gt;
&lt;MenuItem id = &quot;DebugStepOver&quot;
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/configure.in 2004-03-06 16:17:38 UTC (rev 1125)
@@ -59,6 +59,8 @@
dnl find mono debugger
MONO_DEBUGGER_REQUIRED_VERSION=0.6
PKG_CHECK_MODULES(MONO_DEBUGGER, mono-debugger &gt;= $MONO_DEBUGGER_REQUIRED_VERSION)
+debugger_prefix=`pkg-config --variable=prefix mono-debugger`
+AC_SUBST(debugger_prefix)
MOZILLA_HOME=&quot;`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`&quot;
AC_SUBST(MOZILLA_HOME)
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/DebuggerVariablePad.cs 2004-03-06 16:17:38 UTC (rev 1125)
@@ -71,6 +71,8 @@
DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
dbgr.PausedEvent += new EventHandler (OnPausedEvent);
+ dbgr.ResumedEvent += new EventHandler (OnResumedEvent);
+ dbgr.StoppedEvent += new EventHandler (OnStoppedEvent);
}
bool add_array (TreeIter parent, ITargetArrayObject array)
@@ -236,11 +238,16 @@
Hashtable iters = null;
- public void UpdateDisplay ()
+ public void CleanDisplay ()
{
store.Clear ();
iters = new Hashtable ();
+ }
+ public void UpdateDisplay ()
+ {
+ CleanDisplay ();
+
if ((current_frame == null) || (current_frame.Method == null))
return;
@@ -261,6 +268,16 @@
}
}
+ protected void OnStoppedEvent (object o, EventArgs args)
+ {
+ CleanDisplay ();
+ }
+
+ protected void OnResumedEvent (object o, EventArgs args)
+ {
+ CleanDisplay ();
+ }
+
protected void OnPausedEvent (object o, EventArgs args)
{
DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
Modified: trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/src/Main/Base/Commands/DebuggerCommands.cs 2004-03-06 16:17:38 UTC (rev 1125)
@@ -21,6 +21,16 @@
}
}
+ public class KillApplication : AbstractMenuCommand
+ {
+ public override void Run ()
+ {
+ DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
+
+ dbgr.Stop ();
+ }
+ }
+
public class StepOver : AbstractMenuCommand
{
public override void Run ()
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-03-06 16:17:38 UTC (rev 1125)
@@ -157,6 +157,7 @@
DebuggingService dbgr = (DebuggingService)ServiceManager.Services.GetService (typeof (DebuggingService));
dbgr.PausedEvent += new EventHandler (onDebuggerPaused);
dbgr.ResumedEvent += new EventHandler (onDebuggerResumed);
+ dbgr.StoppedEvent += new EventHandler (onDebuggerStopped);
}
void onDebuggerPaused (object o, EventArgs e)
@@ -180,6 +181,16 @@
}
}
}
+
+ void onDebuggerStopped (object o, EventArgs e)
+ {
+ foreach (IViewContent content in ViewContentCollection) {
+ if (content.ContentName != null &amp;&amp; content.ContentName == cur_dbgFilename) {
+ ((IDebuggableEditor)content).ClearExecutingAt (cur_dbgLineNumber);
+ break;
+ }
+ }
+ }
public void InitializeWorkspace()
{
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-06 16:17:38 UTC (rev 1125)
@@ -371,7 +371,7 @@
/r:../../../build/bin/gtkmozembed-sharp.dll \
/r:glade-sharp \
/r:gnome-sharp \
- /r:Mono.Debugger \
+ /r:$(debugger_prefix)/lib/Mono.Debugger.dll \
$(FILES) \
&amp;&amp; cp $(DLL) ../../../build/bin/.
Modified: trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs 2004-03-06 15:37:55 UTC (rev 1124)
+++ trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs 2004-03-06 16:17:38 UTC (rev 1125)
@@ -229,12 +229,7 @@
public void Stop ()
{
- if (!Debugging)
- return;
-
- proc.Kill ();
- proc = null;
- backend = null;
+ Cleanup ();
}
public void StepInto ()
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000729.html">[Monodevelop-patches-list] r1124 - trunk/MonoDevelop/src/Main/Base/Services
</A></li>
<LI>Next message: <A HREF="000731.html">[Monodevelop-patches-list] r1126 - in trunk/MonoDevelop: . build src/AddIns/DisplayBindings/SourceEditor/Properties src/Main/Base/Gui/Workbench
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#730">[ date ]</a>
<a href="thread.html#730">[ thread ]</a>
<a href="subject.html#730">[ subject ]</a>
<a href="author.html#730">[ author ]</a>
</LI>
</UL>
<hr>
<a href="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">More information about the Monodevelop-patches-list
mailing list</a><br>
</body></html>
Ссылка в новой задаче Показать git blame Копировать постоянную ссылку