anjuta r3446 - in trunk: . plugins/project-wizard/templates plugins/project-wizard/templates/gnome/src

[jhs svn gnome org]

Author: jhs
Date: Thu Jan 10 13:43:41 2008
New Revision: 3446
URL: http://svn.gnome.org/viewvc/anjuta?rev=3446&view=rev

Log:
2008-01-10  Johannes Schmid <jhs gnome org>

	* plugins/project-wizard/templates/gnome.wiz:
	* plugins/project-wizard/templates/gnome/src/Makefile.am.tpl:
	* plugins/project-wizard/templates/gnome/src/main.c:
	* plugins/project-wizard/templates/translatable-strings.h:
	
	Fixed #508497 and added a new chooser to select whether to use
	libglade or not.

Modified:
   trunk/ChangeLog
   trunk/plugins/project-wizard/templates/gnome.wiz
   trunk/plugins/project-wizard/templates/gnome/src/Makefile.am.tpl
   trunk/plugins/project-wizard/templates/gnome/src/main.c
   trunk/plugins/project-wizard/templates/translatable-strings.h

Modified: trunk/plugins/project-wizard/templates/gnome.wiz
==============================================================================
--- trunk/plugins/project-wizard/templates/gnome.wiz	(original)
+++ trunk/plugins/project-wizard/templates/gnome.wiz	Thu Jan 10 13:43:41 2008
@@ -27,6 +27,7 @@
 	<property type="hidden" name="HavePackage" default="1"/>
 	<property type="hidden" name="PackageModule1" default="libgnome-2.0 >= 2.14 libgnomeui-2.0 >= 2.14 libglade-2.0 >= 2.6.0"/>
 	<property type="boolean" name="HaveLangCPP" _label="Add C++ support:" _description="Adds c++ support to the project so that c++ source files can be built" default="0"/>
+	<property type="boolean" name="HaveGlade" _label="Use libglade for the UI" _description="Use the libglade-2.0 library to load .glade at runtime" default="1"/>
 	<property type="boolean" name="HaveI18n" _label="Add internationalization:" _description="Adds supports for internationalization so that your project can have translations in different languages" default="1"/>
 	<property type="boolean" name="HaveSharedlib" _label="Add shared library support:" _description="Adds supports for building shared libraries in your project" default="1"/>
 	<property type="boolean" name="HaveGtkDoc" _label="Add gtk-doc system:" _description="gtk-doc is used to compile API documentations for GObject based classes" default="0"/>
@@ -70,7 +71,9 @@
 			<file source="main.c"/>
 			<file source="callbacks.c"/>
 			<file source="callbacks.h"/>
+			[+IF (=(get "HaveGlade") "1")+]
 			<file source="project.glade" destination="[+NameLower+].glade"/>
+			[+ENDIF+]
 			<file source="Makefile.am.tpl" destination="Makefile.am"/>
 		</directory>
 	</directory>

Modified: trunk/plugins/project-wizard/templates/gnome/src/Makefile.am.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/gnome/src/Makefile.am.tpl	(original)
+++ trunk/plugins/project-wizard/templates/gnome/src/Makefile.am.tpl	Thu Jan 10 13:43:41 2008
@@ -3,8 +3,10 @@
 
 ## Created by Anjuta
 
+[+IF (=(get "HaveGlade") "1")+]
 gladedir = $(datadir)/[+NameLower+]/glade
 glade_DATA = [+NameLower+].glade
+[+ENDIF+]
 
 AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \

Modified: trunk/plugins/project-wizard/templates/gnome/src/main.c
==============================================================================
--- trunk/plugins/project-wizard/templates/gnome/src/main.c	(original)
+++ trunk/plugins/project-wizard/templates/gnome/src/main.c	Thu Jan 10 13:43:41 2008
@@ -22,13 +22,16 @@
 
 #include <bonobo.h>
 #include <gnome.h>
-#include <glade/glade.h>
 
 #include "callbacks.h"
 
+[+IF (=(get "HaveGlade") "1")+]
+#include <glade/glade.h>
+
 /* For testing propose use the local (not installed) glade file */
 /* #define GLADE_FILE PACKAGE_DATA_DIR"/[+NameLower+]/glade/[+NameLower+].glade" */
 #define GLADE_FILE "[+NameLower+].glade"
+[+ENDIF+]
 
 GtkWidget*
 create_window (void)

Modified: trunk/plugins/project-wizard/templates/translatable-strings.h
==============================================================================
--- trunk/plugins/project-wizard/templates/translatable-strings.h	(original)
+++ trunk/plugins/project-wizard/templates/translatable-strings.h	Thu Jan 10 13:43:41 2008
@@ -62,7 +62,9 @@
 char *s = N_("Require SDL_ttf:");
 char *s = N_("Select code license");
 char *s = N_("Shell values to watch");
+char *s = N_("Use libglade for the UI");
 char *s = N_("Use pkg-config to add library supports from other packages");
+char *s = N_("Use the libglade-2.0 library to load .glade at runtime");
 char *s = N_("Value Name:");
 char *s = N_("Values to watch");
 char *s = N_("Version:");