anjuta r4088 - in trunk: . plugins/build-basic-autotools plugins/message-view

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sun Jul 20 07:39:04 2008
New Revision: 4088
URL: http://svn.gnome.org/viewvc/anjuta?rev=4088&view=rev

Log:
	* plugins/build-basic-autotools/build-basic-autotools.c,
	plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in,
	plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui,
	plugins/message-view/anjuta-message-manager.ui:
	Fix #375640: Allow user to stop a build in progress


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
   trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in
   trunk/plugins/build-basic-autotools/build-basic-autotools.c
   trunk/plugins/message-view/anjuta-message-manager.ui

Modified: trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
==============================================================================
--- trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui	(original)
+++ trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui	Sun Jul 20 07:39:04 2008
@@ -41,4 +41,10 @@
 			</menu>
 		</placeholder>
 	</popup>
+	<popup name="PopupMessageView">
+		<placeholder name="PlaceholderPopupMessageView">
+			<separator name="separator13"/>
+			<menuitem name="Cancel" action="ActionPopupMVBuildCancel" />
+		</placeholder>
+	</popup>
 </ui>

Modified: trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in
==============================================================================
--- trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in	(original)
+++ trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in	Sun Jul 20 07:39:04 2008
@@ -4,6 +4,7 @@
 Location=anjuta-build-basic-autotools:BasicAutotoolsPlugin
 Icon=anjuta-build-basic-autotools-plugin-48.png
 Interfaces=IAnjutaBuilder,IAnjutaBuildable,IAnjutaFile
+Dependencies=anjuta-message-view:MessageViewPlugin
 
 [File Loader]
 _Title=Execute

Modified: trunk/plugins/build-basic-autotools/build-basic-autotools.c
==============================================================================
--- trunk/plugins/build-basic-autotools/build-basic-autotools.c	(original)
+++ trunk/plugins/build-basic-autotools/build-basic-autotools.c	Sun Jul 20 07:39:04 2008
@@ -1924,6 +1924,42 @@
 	g_free (target);
 }
 
+static void
+mv_cancel (GtkAction *action, BasicAutotoolsPlugin *plugin)
+{
+	IAnjutaMessageManager *msgman;
+		
+	msgman = anjuta_shell_get_interface (ANJUTA_PLUGIN (plugin)->shell,
+										 IAnjutaMessageManager,
+										 NULL);
+	
+	if (msgman != NULL)
+	{
+		IAnjutaMessageView *view;
+		
+		view = ianjuta_message_manager_get_current_view (msgman, NULL);
+		if (view != NULL)
+		{
+			GList *node;
+
+			for (node = g_list_first (plugin->contexts_pool); node != NULL; node = g_list_next (node))
+			{
+				BuildContext *context;
+				
+				context = (BuildContext *)node->data;
+				if (context->message_view == view)
+				{
+					if (context->launcher != NULL)
+					{
+						anjuta_launcher_signal (context->launcher, SIGTERM);
+					}
+					return;
+				}
+			}
+		}	
+	}	
+}
+
 static GtkActionEntry build_actions[] = 
 {
 	{
@@ -2055,6 +2091,12 @@
 		N_("_Clean"), NULL,
 		N_("Clean module"),
 		G_CALLBACK (pm_clean)
+	},
+	{
+		"ActionPopupMVBuildCancel", NULL,
+		N_("_Cancel command"), NULL,
+		N_("Cancel build command"),
+		G_CALLBACK (mv_cancel)
 	}
 };
 

Modified: trunk/plugins/message-view/anjuta-message-manager.ui
==============================================================================
--- trunk/plugins/message-view/anjuta-message-manager.ui	(original)
+++ trunk/plugins/message-view/anjuta-message-manager.ui	Sun Jul 20 07:39:04 2008
@@ -28,5 +28,6 @@
 		<menuitem name="NextMessage" action="ActionMessageNext" />
 		<menuitem name="PrevMessage" action="ActionMessagePrev" />
 		<menuitem name="SaveMessage" action="ActionMessageSave" />
+		<placeholder name="PlaceholderPopupMessageView"/>
 	</popup>
 </ui>