anjuta r4439 - in trunk: . plugins/build-basic-autotools plugins/run-program src

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Thu Dec 11 19:51:57 2008
New Revision: 4439
URL: http://svn.gnome.org/viewvc/anjuta?rev=4439&view=rev

Log:
	* src/anjuta.ui,
	src/main.c,
	plugins/build-basic-autotools/plugin.c,
	plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui,
	(added) plugins/build-basic-autotools/anjuta-build-24.png,
	(added) plugins/build-basic-autotools/anjuta-build-16.png,
	plugins/build-basic-autotools/Makefile.am,
	plugins/run-program/plugin.c,
	plugins/run-program/anjuta-run-program.ui:
	Implemented #563692: added a toolbar with build and execute buttons


Added:
   trunk/plugins/build-basic-autotools/anjuta-build-16.png   (contents, props changed)
   trunk/plugins/build-basic-autotools/anjuta-build-24.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/Makefile.am
   trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
   trunk/plugins/build-basic-autotools/plugin.c
   trunk/plugins/run-program/anjuta-run-program.ui
   trunk/plugins/run-program/plugin.c
   trunk/src/anjuta.ui
   trunk/src/main.c

Modified: trunk/plugins/build-basic-autotools/Makefile.am
==============================================================================
--- trunk/plugins/build-basic-autotools/Makefile.am	(original)
+++ trunk/plugins/build-basic-autotools/Makefile.am	Thu Dec 11 19:51:57 2008
@@ -11,7 +11,9 @@
 build_pixmapsdir = $(anjuta_image_dir)
 build_pixmaps_DATA = \
 	anjuta-build-basic-autotools-plugin-48.png \
-	anjuta-build-basic-autotools-plugin.svg
+	anjuta-build-basic-autotools-plugin.svg \
+	anjuta-build-16.png \
+	anjuta-build-24.png
 
 # Plugin description file
 plugin_in_files = anjuta-build-basic-autotools.plugin.in

Added: trunk/plugins/build-basic-autotools/anjuta-build-16.png
==============================================================================
Binary file. No diff available.

Added: trunk/plugins/build-basic-autotools/anjuta-build-24.png
==============================================================================
Binary file. No diff available.

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	Thu Dec 11 19:51:57 2008
@@ -21,6 +21,12 @@
 			</menu>
 		</placeholder>
 	</menubar>
+	<toolbar name="ToolbarBuild">
+		<placeholder name="PlaceHolderBuild">
+			<toolitem name="BuildProject" action="ActionBuildBuildProject"/>
+			<toolitem name="BuildModule" action="ActionBuildBuildModule"/>
+		</placeholder>
+	</toolbar>
 	<popup name="PopupFileManager">
 		<placeholder name="PlaceholderPopupFileBuild">
 			<menu name="PopupFileBuild" action="ActionPopupBuild">

Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c	(original)
+++ trunk/plugins/build-basic-autotools/plugin.c	Thu Dec 11 19:51:57 2008
@@ -52,6 +52,9 @@
 #endif
 
 #define ICON_FILE "anjuta-build-basic-autotools-plugin-48.png"
+#define ANJUTA_PIXMAP_BUILD            "anjuta-build"
+#define ANJUTA_STOCK_BUILD             "anjuta-build"
+
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-build-basic-autotools-plugin.ui"
 #define MAX_BUILD_PANES 3
 #define PREF_INDICATORS_AUTOMATIC "indicators.automatic"
@@ -2016,7 +2019,7 @@
 		N_("_Build"), NULL, NULL, NULL
 	},
 	{
-		"ActionBuildBuildProject", NULL,
+		"ActionBuildBuildProject", GTK_STOCK_CONVERT,
 		N_("_Build Project"), "<shift>F11",
 		N_("Build whole project"),
 		G_CALLBACK (on_build_project)
@@ -2046,7 +2049,7 @@
 		G_CALLBACK (on_build_tarball)
 	},
 	{
-		"ActionBuildBuildModule", GTK_STOCK_EXECUTE,
+		"ActionBuildBuildModule", ANJUTA_STOCK_BUILD,
 		N_("_Build Module"), "F11",
 		N_("Build module associated with current file"),
 		G_CALLBACK (on_build_module)
@@ -2064,7 +2067,7 @@
 		G_CALLBACK (on_clean_module)
 	},
 	{
-		"ActionBuildCompileFile", GTK_STOCK_CONVERT,
+		"ActionBuildCompileFile", NULL,
 		N_("Co_mpile File"), "F9",
 		N_("Compile current editor file"),
 		G_CALLBACK (on_compile_file)
@@ -2750,6 +2753,20 @@
 	update_module_ui (ba_plugin);
 }
 
+static void
+register_stock_icons (AnjutaPlugin *plugin)
+{	
+	static gboolean registered = FALSE;
+
+	if (registered)
+		return;
+	registered = TRUE;
+
+	BEGIN_REGISTER_ICON (plugin);
+	REGISTER_ICON_FULL (ANJUTA_PIXMAP_BUILD, ANJUTA_STOCK_BUILD);
+	END_REGISTER_ICON;
+}
+
 static gboolean
 activate_plugin (AnjutaPlugin *plugin)
 {
@@ -2757,6 +2774,10 @@
 	static gboolean initialized = FALSE;
 	BasicAutotoolsPlugin *ba_plugin = ANJUTA_PLUGIN_BASIC_AUTOTOOLS (plugin);
 	
+	if (!initialized)
+	{
+		register_stock_icons (plugin);
+	}
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	
 	g_signal_connect (plugin->shell, "save-session",

Modified: trunk/plugins/run-program/anjuta-run-program.ui
==============================================================================
--- trunk/plugins/run-program/anjuta-run-program.ui	(original)
+++ trunk/plugins/run-program/anjuta-run-program.ui	Thu Dec 11 19:51:57 2008
@@ -15,4 +15,9 @@
 			</menu>
 		</placeholder>
 	</menubar>
+	<toolbar name="ToolbarBuild">
+		<placeholder name="PlaceHolderExecute">
+			<toolitem name="RunProgram" action="ActionRunProgram"/>
+		</placeholder>
+	</toolbar>
 </ui>

Modified: trunk/plugins/run-program/plugin.c
==============================================================================
--- trunk/plugins/run-program/plugin.c	(original)
+++ trunk/plugins/run-program/plugin.c	Thu Dec 11 19:51:57 2008
@@ -219,7 +219,7 @@
 	{
 		"ActionRunProgram",
 		GTK_STOCK_EXECUTE,
-		N_("Execute Program"),
+		N_("Execute"),
 		"F3",
 		N_("Run program without debugger"),
 		G_CALLBACK (on_run_program_activate)

Modified: trunk/src/anjuta.ui
==============================================================================
--- trunk/src/anjuta.ui	(original)
+++ trunk/src/anjuta.ui	Thu Dec 11 19:51:57 2008
@@ -59,6 +59,11 @@
 		</placeholder>
 		<placeholder name="TestPlaceholder" />
 	</menubar>
-	<toolbar name="ToolbarMain"></toolbar>
-	<toolbar name="ToolbarBrowser"></toolbar>
+	<toolbar name="ToolbarMain"/>
+	<toolbar name="ToolbarBrowser"/>
+	<toolbar name="ToolbarBookmark"/>
+	<toolbar name="ToolbarBuild">
+		<placeholder name="PlaceHolderBuild"/>
+		<placeholder name="PlaceHolderExecute"/>
+	</toolbar>
 </ui>

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Thu Dec 11 19:51:57 2008
@@ -387,7 +387,7 @@
 
 	im_file = anjuta_res_get_pixmap_file (ANJUTA_PIXMAP_SPLASH_SCREEN);
 	
-	/* Initialize applicatoin */
+	/* Initialize application */
 	app = anjuta_new (argv[0], file_list, no_splash, no_session, no_files,
 					  im_file, proper_shutdown, anjuta_geometry);