SF.net SVN: geany:[3177] branches/build-system

[ntrel at users.sourceforge.net]

Revision: 3177
          http://geany.svn.sourceforge.net/geany/?rev=3177&view=rev
Author:   ntrel
Date:     2008-11-05 16:49:44 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Factor with add_build_command_widgets().

Modified Paths:
--------------
    branches/build-system/ChangeLog
    branches/build-system/src/build.c

Modified: branches/build-system/ChangeLog
===================================================================
--- branches/build-system/ChangeLog	2008-11-05 16:25:49 UTC (rev 3176)
+++ branches/build-system/ChangeLog	2008-11-05 16:49:44 UTC (rev 3177)
@@ -2,6 +2,8 @@
 
  * src/build.c:
    Fix warning with -Wall -Wextra.
+ * src/build.c:
+   Factor with add_build_command_widgets().
 
 
 2008-111-01 Lex Trotman <elextr(at)gmail(dot)com>

Modified: branches/build-system/src/build.c
===================================================================
--- branches/build-system/src/build.c	2008-11-05 16:25:49 UTC (rev 3176)
+++ branches/build-system/src/build.c	2008-11-05 16:49:44 UTC (rev 3177)
@@ -1591,31 +1591,13 @@
 }
 
 
-static void show_includes_arguments_gen(void)
+static void add_build_command_widgets(GtkWidget *dialog, GtkWidget *vbox, GeanyFiletype *ft)
 {
-	GtkWidget *dialog, *label, *entries[3], *vbox, *build_entry;
+	GtkWidget *label, *entries[3], *build_entry;
 	GtkWidget *ft_table = NULL;
 	GtkWidget *pr_table = NULL;
 	gint row = 0;
-	gint response;
-	GeanyDocument *doc = document_get_current();
-	GeanyFiletype *ft = NULL;
 
-	if (doc != NULL)
-		ft = doc->file_type;
-	g_return_if_fail(ft != NULL);
-
-	dialog = gtk_dialog_new_with_buttons(_("Build Menu Commands"), GTK_WINDOW(main_widgets.window),
-										GTK_DIALOG_DESTROY_WITH_PARENT,
-										GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-										GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
-	vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog));
-	gtk_widget_set_name(dialog, "GeanyDialog");
-
-	label = gtk_label_new(_("Set the commands for the build menu."));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_container_add(GTK_CONTAINER(vbox), label);
-
 	if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec)
 	{
 		GtkWidget *align, *frame;
@@ -1777,7 +1759,33 @@
 					gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref);
 
     }
+}
 
+
+static void show_includes_arguments_gen(void)
+{
+	GtkWidget *dialog, *label, *vbox;
+	gint response;
+	GeanyDocument *doc = document_get_current();
+	GeanyFiletype *ft = NULL;
+
+	if (doc != NULL)
+		ft = doc->file_type;
+	g_return_if_fail(ft != NULL);
+
+	dialog = gtk_dialog_new_with_buttons(_("Build Menu Commands"), GTK_WINDOW(main_widgets.window),
+										GTK_DIALOG_DESTROY_WITH_PARENT,
+										GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+										GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+	vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog));
+	gtk_widget_set_name(dialog, "GeanyDialog");
+
+	label = gtk_label_new(_("Set the commands for the build menu."));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_container_add(GTK_CONTAINER(vbox), label);
+
+	add_build_command_widgets(dialog, vbox, ft);
+
 	label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n"
 							"%e will be replaced by the filename without extension, e.g. test_file"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -1856,6 +1864,7 @@
 		can_build = can_make && ! is_c_header(doc->file_name);
 	else
 		can_build = can_make;
+
 	if (menu_items->item_compile)
 		gtk_widget_set_sensitive(menu_items->item_compile, can_build && ft->actions->can_compile);
 	if (menu_items->item_link)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.