[anjuta] project-wizard: Improve gnome shell extension template

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 0827ab7bb7e6ba04a0908767b110a094051461b7
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sat Oct 22 19:01:33 2011 +0200

    project-wizard: Improve gnome shell extension template
    
    Merge plugin and project name, allowing space in project name
    Group Metadata and Option page
    Get compatible version as a simple list of version separated by comma
    Add the standard GNOME foot icon

 plugins/project-wizard/druid.c                     |  199 ++++++++++----------
 plugins/project-wizard/property.c                  |   55 ++++---
 plugins/project-wizard/property.h                  |    1 +
 plugins/project-wizard/templates/Makefile.am       |    2 +
 .../templates/gnome-shell-extension.wiz.in         |   33 ++--
 .../gnome-shell-extension/configure.ac.tpl         |    2 +-
 .../gnome-shell-extension/src/metadata.json        |    4 +-
 .../gnome-shell-extension/src/stylesheet.css       |    2 +-
 plugins/project-wizard/templates/gnome.png         |  Bin 0 -> 1171 bytes
 plugins/project-wizard/templates/gnome.svg         |   72 +++++++
 10 files changed, 226 insertions(+), 144 deletions(-)
---
diff --git a/plugins/project-wizard/druid.c b/plugins/project-wizard/druid.c
index f308a84..f53db7e 100644
--- a/plugins/project-wizard/druid.c
+++ b/plugins/project-wizard/druid.c
@@ -82,7 +82,7 @@
 struct _NPWDruid
 {
 	GtkWindow* window;
-	
+
 	GtkNotebook* project_book;
 	GtkVBox *error_vbox;
 	GtkWidget *error_extra_widget;
@@ -92,10 +92,10 @@ struct _NPWDruid
 
 	const gchar* project_file;
 	NPWPlugin* plugin;
-	
+
 	gint next_page;
 	gint last_page;
-	
+
 	GQueue* page_list;
 	GHashTable* values;
 	NPWPageParser* parser;
@@ -126,10 +126,10 @@ npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageT
 	gchar *message;
 	const gchar *stock_id = NULL;
 	const gchar *title = NULL;
-	
+
 	assistant = GTK_ASSISTANT (druid->window);
 	page = gtk_assistant_get_nth_page (assistant, ERROR_PAGE);
-	
+
 	/* Set dialog kind */
 	switch (type)
 	{
@@ -155,7 +155,7 @@ npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageT
 	default:
 		g_warning ("Unknown GtkMessageType %u", type);
 		break;
-	}	
+	}
 	gtk_assistant_set_page_title (assistant, page, title);
 	if (type == GTK_MESSAGE_ERROR)
 	{
@@ -168,14 +168,14 @@ npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageT
 		gtk_assistant_set_page_complete (assistant, page, TRUE);
 	}
 	gtk_image_set_from_stock (druid->error_icon, stock_id, GTK_ICON_SIZE_DIALOG);
-	
+
 	/* Set message */
 	va_start (args, mesg);
 	message = g_strdup_vprintf (mesg, args);
 	va_end (args);
 	gtk_label_set_markup (druid->error_message, message);
 	g_free (message);
-	
+
 	/* Set detail */
 	if (detail == NULL)
 	{
@@ -184,7 +184,7 @@ npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageT
 	else
 	{
 		GtkLabel *label;
-		
+
 		gtk_widget_show (druid->error_detail);
 		label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (druid->error_detail)));
 		gtk_label_set_text (label, detail);
@@ -215,7 +215,7 @@ cb_druid_add_summary_property (NPWProperty* property, gpointer user_data)
 	if (npw_property_get_options (property) & NPW_SUMMARY_OPTION)
 	{
 		g_string_append_printf (text, "%s %s\n",
-								npw_property_get_label (property), 
+								npw_property_get_label (property),
 								npw_property_get_value (property));
 	}
 }
@@ -240,11 +240,11 @@ npw_druid_fill_summary_page (NPWDruid* druid)
 	{
 		npw_page_foreach_property (page, (GFunc)cb_druid_add_summary_property, text);
 	}
-	
+
 	label = GTK_LABEL (gtk_assistant_get_nth_page (GTK_ASSISTANT (druid->window), FINISH_PAGE));
 	gtk_label_set_markup (label, text->str);
 	g_string_free (text, TRUE);
-	
+
 	gtk_assistant_set_page_complete (GTK_ASSISTANT (druid->window), GTK_WIDGET (label), TRUE);
 }
 
@@ -257,14 +257,14 @@ on_druid_project_update_selected (GtkIconView* view, NPWDruid *druid)
 {
 	GList *selected;
 	NPWHeader* header = NULL;
-	
+
 	/* No item can be selected when the view is mapped */
 	selected = gtk_icon_view_get_selected_items (view);
 	if (selected != NULL)
 	{
 		GtkTreeIter iter;
 		GtkTreeModel *model;
-	
+
 		model = gtk_icon_view_get_model (view);
 		if (gtk_tree_model_get_iter (model, &iter, (GtkTreePath *)selected->data))
 		{
@@ -296,7 +296,7 @@ cb_druid_insert_project_icon (gpointer data, gpointer user_data)
 						DESC_COLUMN, npw_header_get_description (header),
 						DATA_COLUMN, header,
 						-1);
-	
+
 	g_object_unref (pixbuf);
 }
 
@@ -316,25 +316,25 @@ cb_druid_insert_project_page (gpointer value, gpointer user_data)
 	const gchar* category;
 
 	category = npw_header_get_category ((NPWHeader *)template_list->data);
-	
-	/* Build another complete wizard dialog from the gtk builder file 
+
+	/* Build another complete wizard dialog from the gtk builder file
 	 * but keep only the project selection notebook page */
 	builder = gtk_builder_new ();
 	if (!gtk_builder_add_from_file (builder, GTK_BUILDER_UI_FILE, NULL))
 	{
 		g_warn_if_reached ();
-		g_object_unref (builder); 
+		g_object_unref (builder);
 		return;
 	}
-	
+
 	/* Fill icon view */
 	view = GTK_ICON_VIEW (gtk_builder_get_object (builder, PROJECT_LIST));
 	gtk_icon_view_set_pixbuf_column (view, PIXBUF_COLUMN);
 	gtk_icon_view_set_markup_column (view, TEXT_COLUMN);
 	store = gtk_list_store_new (4, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
-	g_list_foreach (template_list, cb_druid_insert_project_icon, store); 
+	g_list_foreach (template_list, cb_druid_insert_project_icon, store);
 	gtk_icon_view_set_model (view, GTK_TREE_MODEL (store));
-	
+
 	/* Connect signal to update dialog */
 	g_signal_connect (G_OBJECT (view), "selection-changed", G_CALLBACK (on_druid_project_update_selected), druid);
 	g_signal_connect (G_OBJECT (view), "map", G_CALLBACK (on_druid_project_update_selected), druid);
@@ -344,15 +344,15 @@ cb_druid_insert_project_page (gpointer value, gpointer user_data)
 	book = GTK_NOTEBOOK (gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), PROJECT_PAGE));
 	child = gtk_notebook_get_nth_page (book, 0);
 	label = gtk_notebook_get_tab_label (book, child);
-	gtk_label_set_text (GTK_LABEL(label), (const gchar *)category);	
-	
+	gtk_label_set_text (GTK_LABEL(label), (const gchar *)category);
+
 	/* Pick up the filled project selection page from the newly created dialog
-	 * add it to the wizard project notebook and destroy the dialog 
+	 * add it to the wizard project notebook and destroy the dialog
 	 */
 	gtk_notebook_remove_page (book, 0);
 	gtk_notebook_append_page (druid->project_book, child, label);
 	gtk_widget_destroy (assistant);
-	
+
 	g_object_unref (builder);
 }
 
@@ -362,15 +362,15 @@ npw_druid_fill_selection_page (NPWDruid* druid, const gchar *directory)
 {
 	gchar* dir;
 	const gchar * const * sys_dir;
- 
+
 	/* Remove all previous data */
 	druid->project_book = GTK_NOTEBOOK (gtk_assistant_get_nth_page (GTK_ASSISTANT (druid->window), PROJECT_PAGE));
-	gtk_notebook_remove_page(druid->project_book, 0);	
-	npw_header_list_free (druid->header_list);	
-	
+	gtk_notebook_remove_page(druid->project_book, 0);
+	npw_header_list_free (druid->header_list);
+
 	/* Create list of projects */
-	druid->header_list = npw_header_list_new ();	
-	
+	druid->header_list = npw_header_list_new ();
+
 	if (directory != NULL)
 	{
 		/* Read project template only in specified directory */
@@ -384,8 +384,8 @@ npw_druid_fill_selection_page (NPWDruid* druid, const gchar *directory)
 		dir = g_build_filename (g_get_user_data_dir (), "anjuta", "project", NULL);
 		npw_header_list_readdir (&druid->header_list, dir);
 		g_free (dir);
-	
-		/* Read project template in system directory */	
+
+		/* Read project template in system directory */
 		for (sys_dir = g_get_system_data_dirs (); *sys_dir != NULL; sys_dir++)
 		{
 			dir = g_build_filename (*sys_dir, "anjuta", "project", NULL);
@@ -396,10 +396,10 @@ npw_druid_fill_selection_page (NPWDruid* druid, const gchar *directory)
 		/* Read anjuta installation directory */
 		npw_header_list_readdir (&druid->header_list, PROJECT_WIZARD_DIRECTORY);
 	}
-	
+
 	if (g_list_length (druid->header_list) == 0)
 	{
-		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (druid->plugin)->shell),_("Unable to find any project template in %s"), PROJECT_WIZARD_DIRECTORY);		
+		anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (druid->plugin)->shell),_("Unable to find any project template in %s"), PROJECT_WIZARD_DIRECTORY);
 		return FALSE;
 	}
 
@@ -407,7 +407,7 @@ npw_druid_fill_selection_page (NPWDruid* druid, const gchar *directory)
 	g_list_foreach (druid->header_list, cb_druid_insert_project_page, druid);
 
 	gtk_widget_show_all (GTK_WIDGET (druid->project_book));
-	
+
 	return TRUE;
 }
 
@@ -444,7 +444,7 @@ cb_druid_add_property (NPWProperty* property, gpointer user_data)
 	{
 		/* Not hidden property */
 		description = npw_property_get_description (property);
-	
+
 		/* Set description tooltip */
 		if (description && (*description != '\0'))
 		{
@@ -454,9 +454,9 @@ cb_druid_add_property (NPWProperty* property, gpointer user_data)
 		label = gtk_label_new (npw_property_get_label (property));
 		gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 		gtk_misc_set_padding (GTK_MISC (label), 6, 6);
-		
+
 		switch (npw_property_get_type (property))
-		{				
+		{
 			case NPW_PACKAGE_PROPERTY:
 				gtk_table_resize (data->table, data->row + 2, 1);
 				gtk_table_attach (data->table, label, 0, 1, data->row, data->row + 1,
@@ -478,7 +478,7 @@ cb_druid_add_property (NPWProperty* property, gpointer user_data)
 				                  (GtkAttachOptions)(attach), 0, 0, 0);
 				data->row++;
 		}
-		
+
 		/* Set first entry */
 		if (data->first_entry == NULL) data->first_entry = entry;
 	}
@@ -494,7 +494,7 @@ npw_druid_fill_property_page (NPWDruid* druid, NPWPage* page)
 
 	/* Remove previous widgets */
 	gtk_container_foreach (GTK_CONTAINER (npw_page_get_widget (page)), cb_druid_destroy_widget, NULL);
- 		
+
 	/* Update title	*/
 	gtk_assistant_set_page_title (GTK_ASSISTANT (druid->window), widget, npw_page_get_label (page));
 
@@ -510,7 +510,7 @@ npw_druid_fill_property_page (NPWDruid* druid, NPWPage* page)
 	{
 		gtk_container_set_focus_child (GTK_CONTAINER (data.table), data.first_entry);
 	}
-	
+
 	gtk_widget_show_all (widget);
 }
 
@@ -534,19 +534,19 @@ npw_druid_add_new_page (NPWDruid* druid)
 		GtkWidget *table;
 		GtkAssistant *assistant;
 
-		/* Build another complete wizard dialog from the gtk builder file 
+		/* Build another complete wizard dialog from the gtk builder file
 	 	* but keep only the property assistant page */
 		builder = gtk_builder_new ();
 		if (!gtk_builder_add_from_file (builder, GTK_BUILDER_UI_FILE, NULL))
 		{
 			g_warn_if_reached ();
-			g_object_unref (builder); 
-			
+			g_object_unref (builder);
+
 			return NULL;
 		}
 		assistant = GTK_ASSISTANT (gtk_builder_get_object (builder, NEW_PROJECT_DIALOG));
 		table = GTK_WIDGET (gtk_builder_get_object (builder, PROPERTY_TABLE));
-		
+
 		widget = gtk_assistant_get_nth_page (assistant, PROPERTY_PAGE);
 		type = gtk_assistant_get_page_type (assistant, widget);
 		pixbuf = gtk_assistant_get_page_header_image (assistant, widget);
@@ -555,16 +555,16 @@ npw_druid_add_new_page (NPWDruid* druid)
 		gtk_assistant_insert_page (GTK_ASSISTANT (druid->window), widget, druid->next_page);
 		gtk_assistant_set_page_type (GTK_ASSISTANT (druid->window), widget, type);
 		if (pixbuf != NULL)
-		{	
+		{
 			gtk_assistant_set_page_header_image (GTK_ASSISTANT (druid->window), widget, pixbuf);
 			g_object_ref (pixbuf);
 		}
-		gtk_assistant_set_page_complete (GTK_ASSISTANT (druid->window), widget, TRUE);		
+		gtk_assistant_set_page_complete (GTK_ASSISTANT (druid->window), widget, TRUE);
 		gtk_widget_destroy (GTK_WIDGET (assistant));
-		
-		/* Builder get reference on all built widget, so unref it when all work is done */		
+
+		/* Builder get reference on all built widget, so unref it when all work is done */
 		g_object_unref (builder);
-		
+
 		/* Create new page */
 		page = npw_page_new (druid->values);
 		npw_page_set_widget (page, table);
@@ -587,13 +587,13 @@ npw_druid_remove_following_page (NPWDruid* druid)
 	for(;;)
 	{
 		GtkWidget *widget;
-		
+
 		page = g_queue_pop_nth (druid->page_list, num - PROPERTY_PAGE);
 		if (page == NULL) break;
-		
+
 		widget = gtk_assistant_get_nth_page (GTK_ASSISTANT (druid->window), num);
 		gtk_container_remove (GTK_CONTAINER (druid->window), widget);
-		
+
 		npw_page_free (page);
 	}
 }
@@ -607,7 +607,7 @@ typedef struct _NPWSaveValidPropertyData
 	gboolean modified;
 	GString *error;
 	GString *warning;
-	
+
 } NPWSaveValidPropertyData;
 
 static void
@@ -621,8 +621,8 @@ cb_save_valid_property (NPWProperty* property, gpointer user_data)
 	modified = npw_property_update_value_from_widget (property);
 	if (modified) data->modified = modified;
        	value = npw_property_get_value (property);
-	
-	/* Check mandatory property */ 
+
+	/* Check mandatory property */
 	if (modified &&  (npw_property_get_options (property) & NPW_MANDATORY_OPTION))
 	{
 		if ((value == NULL) || (strlen (value) <= 0))
@@ -638,7 +638,7 @@ cb_save_valid_property (NPWProperty* property, gpointer user_data)
 	if (modified && !npw_property_is_valid_restriction (property))
 	{
 		NPWPropertyRestriction restriction = npw_property_get_restriction (property);
-		
+
 		switch (restriction)
 		{
 		case NPW_FILENAME_RESTRICTION:
@@ -651,10 +651,15 @@ cb_save_valid_property (NPWProperty* property, gpointer user_data)
 									_("Field \"%s\" must contains only letters, digits, the following characters \"#$:%%+, = ^_`~\" or directory separators. In addition you cannot have a leading dash. Please fix it."),
 									npw_property_get_label (property));
 			break;
+		case NPW_PRINTABLE_RESTRICTION:
+			g_string_append_printf (data->error,
+									_("Field \"%s\" must contains only ASCII printable characters, no accentuated characters by example. Please fix it."),
+									npw_property_get_label (property));
+			break;
 		default:
 			g_string_append_printf (data->error,
 									_("Unknown error."));
-									
+
 		}
 		npw_property_remove_value (property);
 	}
@@ -679,7 +684,7 @@ cb_save_valid_property (NPWProperty* property, gpointer user_data)
 
 		if (exist)
 		{
-			g_string_append_printf (data->warning, is_directory ? 
+			g_string_append_printf (data->warning, is_directory ?
 										_("Directory \"%s\" is not empty. Project creation could fail if some files "
 										  "cannot be written. Do you want to continue?") :
 											_("File \"%s\" already exists. Do you want to overwrite it?"),
@@ -706,7 +711,7 @@ npw_druid_save_valid_values (NPWDruid* druid)
 	npw_page_foreach_property (page, (GFunc)cb_save_valid_property, &data);
 
 	if (data.modified) npw_druid_remove_following_page (druid);
-	
+
 	if (data.error->len)
 	{
 		npw_druid_fill_error_page (druid, NULL,
@@ -727,7 +732,7 @@ npw_druid_save_valid_values (NPWDruid* druid)
 									data.warning->str);
 		ok = FALSE;
 	}
-	
+
 	g_string_free (data.error, TRUE);
 	g_string_free (data.warning, TRUE);
 
@@ -742,7 +747,7 @@ npw_druid_set_busy (NPWDruid *druid, gboolean busy_state)
 {
 	if (druid->busy == busy_state)
 		return;
-	
+
 	/* Set busy state */
 	if (busy_state)
 		anjuta_status_busy_push (anjuta_shell_get_status (ANJUTA_PLUGIN (druid->plugin)->shell, NULL));
@@ -787,12 +792,12 @@ on_druid_get_new_page (NPWAutogen* gen, gpointer data)
 	NPWPage* page;
 
 	page = g_queue_peek_nth (druid->page_list, druid->next_page - PROPERTY_PAGE);
-	
+
 	if (npw_page_get_name (page) == NULL)
 	{
 		/* no page, display finish page */
 		npw_druid_fill_summary_page (druid);
-		
+
 		gtk_assistant_set_current_page (GTK_ASSISTANT (druid->window), FINISH_PAGE);
 	}
 	else
@@ -809,7 +814,7 @@ on_druid_parse_page (const gchar* output, gpointer data)
 {
 	GError *error = NULL;
 	NPWPageParser* parser = (NPWPageParser*)data;
-	
+
 	npw_page_parser_parse (parser, output, strlen (output), &error);
 
 	if (error)
@@ -835,7 +840,7 @@ on_install_button_clicked (GtkWidget *button, NPWDruid *druid)
 	GList *missing_programs, *missing_packages;
 	GList *missing_files = NULL;
 	GList *node;
-	
+
 
 	missing_programs = npw_header_check_required_programs (druid->header);
 	missing_packages = npw_header_check_required_packages (druid->header);
@@ -853,7 +858,7 @@ on_install_button_clicked (GtkWidget *button, NPWDruid *druid)
 		missing_files = g_list_append (missing_files, pk_pkg_config_string);
 	}
 	g_list_free (missing_packages);
-	
+
 	if (missing_files)
 	{
 		gchar * missing_names = NULL;
@@ -880,7 +885,7 @@ check_and_warn_missing (NPWDruid *druid)
 	{
 		missing_message = g_string_new (NULL);
 	}
-	
+
 	if (missing_programs)
 	{
 		gchar *missing_progs;
@@ -891,7 +896,7 @@ check_and_warn_missing (NPWDruid *druid)
 		g_free (missing_progs);
 		anjuta_util_glist_strings_free (missing_programs);
 	}
-	
+
 	if (missing_packages)
 	{
 		gchar *missing_pkgs;
@@ -902,7 +907,7 @@ check_and_warn_missing (NPWDruid *druid)
 		g_free (missing_pkgs);
 		anjuta_util_glist_strings_free (missing_packages);
 	}
-	
+
 	if (missing_message)
 	{
 		GtkWidget *hbox, *install_button;
@@ -914,7 +919,7 @@ check_and_warn_missing (NPWDruid *druid)
 		hbox = gtk_hbox_new (FALSE, 0);
 		gtk_widget_show (hbox);
 
-#ifdef ENABLE_PACKAGEKIT		
+#ifdef ENABLE_PACKAGEKIT
 		install_button =
 			gtk_button_new_with_label (_("Install missing packages"));
 		gtk_box_pack_end (GTK_BOX (hbox), install_button, FALSE, FALSE, 10);
@@ -940,12 +945,12 @@ check_and_warn_missing (NPWDruid *druid)
 									missing_message->str);
 		g_string_free (missing_message, TRUE);
 	}
-	
+
 	return !missing_message;
 }
 
 /* This function is called to compute the next page AND to determine the status
- * of last button: it does not mean that the user go to the next page. 
+ * of last button: it does not mean that the user go to the next page.
  * We need this information to generate the next page just before displaying it.
  * So a progress page is inserted between all pages of the wizard. We use the
  * prepare signal handler of this page to compute the next page and switch to
@@ -968,9 +973,9 @@ static gboolean
 on_druid_delayed_set_error_page (gpointer data)
 {
 	GtkAssistant * assistant = (GtkAssistant *)data;
-	
+
 	gtk_assistant_set_current_page (assistant, ERROR_PAGE);
-	
+
 	return FALSE;
 }
 
@@ -978,7 +983,7 @@ static void
 on_druid_prepare (GtkAssistant* assistant, GtkWidget *page, NPWDruid* druid)
 {
 	gint current_page = gtk_assistant_get_current_page (assistant);
-	
+
 	if (current_page == PROGRESS_PAGE)
 	{
 		/* Generate the next page */
@@ -988,26 +993,26 @@ on_druid_prepare (GtkAssistant* assistant, GtkWidget *page, NPWDruid* druid)
 			const gchar* new_project;
 
 			new_project = npw_header_get_filename (druid->header);
-			
+
 			if (druid->project_file != new_project)
-			{	
+			{
 				if (druid->last_page != ERROR_PAGE)
 				/* Check if necessary programs for this project is installed */
 				if (!check_and_warn_missing (druid))
-				{   
+				{
 					/* The page change is delayed because in the latest version of
 					 * GtkAssistant, the page switch is not completely done when
 					 * the signal is called. A page change in the signal handler
 					 * will be partialy overwritten */
 					g_idle_add (on_druid_delayed_set_error_page, druid->window);
 					return;
-				}   
-				
+				}
+
 				/* Change project */
 				druid->project_file = new_project;
 				npw_druid_remove_following_page (druid);
 				npw_autogen_set_input_file (druid->gen, druid->project_file, "[+","+]");
-				
+
 			}
 		}
 		else
@@ -1020,7 +1025,7 @@ on_druid_prepare (GtkAssistant* assistant, GtkWidget *page, NPWDruid* druid)
 				 * the signal is called. A page change in the signal handler
 				 * will be partialy overwritten */
 				g_idle_add (on_druid_delayed_set_error_page, druid->window);
-				
+
 				return;
 			}
 		}
@@ -1032,7 +1037,7 @@ on_druid_prepare (GtkAssistant* assistant, GtkWidget *page, NPWDruid* druid)
 			if (druid->parser != NULL)
 				npw_page_parser_free (druid->parser);
 			druid->parser = npw_page_parser_new (npw_druid_add_new_page (druid), druid->project_file, druid->next_page - PROPERTY_PAGE);
-			
+
 			npw_autogen_set_output_callback (druid->gen, on_druid_parse_page, druid->parser);
 			npw_autogen_write_definition_file (druid->gen, druid->values);
 			npw_autogen_execute (druid->gen, on_druid_get_new_page, druid, NULL);
@@ -1066,7 +1071,7 @@ on_druid_prepare (GtkAssistant* assistant, GtkWidget *page, NPWDruid* druid)
 		druid->last_page = current_page;
 		druid->next_page = current_page + 1;
 	}
-	
+
 }
 
 static void
@@ -1085,12 +1090,12 @@ npw_druid_create_assistant (NPWDruid* druid, const gchar *directory)
 {
 	AnjutaShell *shell;
 	GtkBuilder *builder;
-	GError* error = NULL;		
+	GError* error = NULL;
 	GtkAssistant *assistant;
 	GtkWidget *page;
-	
+
 	g_return_val_if_fail (druid->window == NULL, NULL);
-	
+
 	shell = ANJUTA_PLUGIN (druid->plugin)->shell;
 
 	/* Create GtkAssistant using GtkBuilder, glade doesn't seem to work*/
@@ -1128,19 +1133,19 @@ npw_druid_create_assistant (NPWDruid* druid, const gchar *directory)
 	/* Use progress page to stop the flow */
 	/*page = gtk_assistant_get_nth_page (assistant, PROGRESS_PAGE);
 	gtk_assistant_set_page_complete (assistant, page, FALSE);*/
-	
+
 	/* Remove property page, will be created later as needed */
 	page = gtk_assistant_get_nth_page (assistant, PROPERTY_PAGE);
 	gtk_container_remove (GTK_CONTAINER (assistant), page);
-	
+
 	/* Add dialog widget to anjuta status. */
 	anjuta_status_add_widget (anjuta_shell_get_status (shell, NULL), GTK_WIDGET (assistant));
 
 	gtk_window_set_default_size (GTK_WINDOW (assistant),
 	                             600, 500);
-	
+
 	gtk_widget_show_all (GTK_WIDGET (assistant));
-	
+
 	return GTK_WIDGET(assistant);
 }
 
@@ -1160,7 +1165,7 @@ npw_druid_add_default_property (NPWDruid* druid)
 	/* Add default base project directory */
 	value = npw_value_heap_find_value (druid->values, ANJUTA_PROJECT_DIRECTORY_PROPERTY);
 	npw_value_set_value (value, g_get_home_dir (), NPW_VALID_VALUE);
-	
+
 	/* Add user name */
 	value = npw_value_heap_find_value (druid->values, USER_NAME_PROPERTY);
 	s = (gchar *)g_get_real_name();
@@ -1187,7 +1192,7 @@ npw_druid_new (NPWPlugin* plugin, const gchar *directory)
 	{
 		anjuta_util_dialog_error (NULL, _("Could not find autogen version 5; please install the autogen package. You can get it from http://autogen.sourceforge.net.";));
 		return NULL;
-	}	
+	}
 
 	druid = g_new0(NPWDruid, 1);
 	druid->plugin = plugin;
@@ -1202,10 +1207,10 @@ npw_druid_new (NPWPlugin* plugin, const gchar *directory)
 	if (npw_druid_create_assistant (druid, directory) == NULL)
 	{
 		npw_druid_free (druid);
-		
+
 		return NULL;
 	}
-	
+
 	npw_druid_add_default_property (druid);
 
 	return druid;
diff --git a/plugins/project-wizard/property.c b/plugins/project-wizard/property.c
index aa9b5cb..bff16b6 100644
--- a/plugins/project-wizard/property.c
+++ b/plugins/project-wizard/property.c
@@ -88,7 +88,8 @@ static const gchar* NPWPropertyTypeString[] = {
 
 static const gchar* NPWPropertyRestrictionString[] = {
 	"filename",
-	"directory"
+	"directory",
+	"printable"
 };
 
 /* Item object
@@ -98,12 +99,12 @@ static NPWItem*
 npw_item_new (const gchar *name, const gchar *label, gint language)
 {
 	NPWItem *item;
-	
+
 	item = g_slice_new (NPWItem);
 	item->name = g_strdup (name);
 	item->label = g_strdup (label);
 	item->language = language;
-	
+
 	return item;
 }
 
@@ -161,7 +162,7 @@ npw_property_restriction_from_string (const gchar* restriction)
 				return (NPWPropertyRestriction)(i + 1);
 			}
 		}
-	}	
+	}
 
 	return NPW_NO_RESTRICTION;
 }
@@ -284,7 +285,17 @@ npw_property_is_valid_restriction (const NPWProperty* prop)
 				return FALSE;
 		}
 		break;
+	case NPW_PRINTABLE_RESTRICTION:
+		value = npw_property_get_value (prop);
+
+		if (value == NULL) return TRUE;
 
+		/* All characters should be ASCII printable character */
+		for (value++; *value != '\0'; value++)
+		{
+			if (!g_ascii_isprint (*value)) return FALSE;
+		}
+		break;
 	default:
 		break;
 	}
@@ -335,7 +346,7 @@ cb_browse_button_clicked (GtkButton *button, NPWProperty* prop)
 {
 	GtkWidget *dialog;
 	gchar *path;
-	
+
 	switch (prop->type)
 	{
 	case NPW_DIRECTORY_PROPERTY:
@@ -388,12 +399,12 @@ cb_preview_update (GtkFileChooser *fc,
 		pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
 
 		gtk_file_chooser_set_preview_widget_active (fc, pixbuf != NULL);
-		
+
 		if (pixbuf) {
 			gtk_image_set_from_pixbuf (preview, pixbuf);
 			g_object_unref (pixbuf);
 		}
-		
+
 		g_free (filename);
 	}
 }
@@ -408,7 +419,7 @@ cb_icon_button_clicked (GtkButton *button, NPWProperty* prop)
 
 	dialog = gtk_file_chooser_dialog_new (_("Select an Image File"),
 											GTK_WINDOW (gtk_widget_get_ancestor (prop->widget, GTK_TYPE_WINDOW)),
-					      					GTK_FILE_CHOOSER_ACTION_OPEN, 
+					      					GTK_FILE_CHOOSER_ACTION_OPEN,
 					      					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 					      					NULL);
@@ -473,15 +484,15 @@ npw_property_create_widget (NPWProperty* prop)
 		if ((prop->options & NPW_EXIST_SET_OPTION) && !(prop->options & NPW_EXIST_OPTION))
 		{
 			GtkWidget *button;
-			
+
 			// Use an entry box and a browse button as GtkFileChooserButton
 			// allow to select only existing file
 			widget = gtk_hbox_new (FALSE, 3);
-			
+
 			entry = gtk_entry_new ();
 			if (value) gtk_entry_set_text (GTK_ENTRY (entry), value);
 			gtk_container_add (GTK_CONTAINER (widget), entry);
-			
+
 			button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
 			g_signal_connect (button, "clicked", G_CALLBACK (cb_browse_button_clicked), prop);
 			gtk_container_add (GTK_CONTAINER (widget), button);
@@ -498,7 +509,7 @@ npw_property_create_widget (NPWProperty* prop)
 				entry = gtk_file_chooser_button_new (_("Choose file"),
 												 GTK_FILE_CHOOSER_ACTION_OPEN);
 			}
-				
+
 			if (value)
 			{
 				GFile *file = g_file_parse_name (value);
@@ -568,7 +579,7 @@ npw_property_create_widget (NPWProperty* prop)
 		return NULL;
 	}
 	prop->widget = entry;
-	
+
 
 	return widget == NULL ? entry : widget;
 }
@@ -677,7 +688,7 @@ npw_property_set_value_from_widget (NPWProperty* prop, NPWValueTag tag)
 		}
 		break;
 	case NPW_ICON_PROPERTY:
-		g_object_get (G_OBJECT (gtk_button_get_image (GTK_BUTTON (prop->widget))), "file", &alloc_value, NULL);	
+		g_object_get (G_OBJECT (gtk_button_get_image (GTK_BUTTON (prop->widget))), "file", &alloc_value, NULL);
 		value = alloc_value;
 		break;
 	case NPW_LIST_PROPERTY:
@@ -696,7 +707,7 @@ npw_property_set_value_from_widget (NPWProperty* prop, NPWValueTag tag)
 		break;
 	}
 	case NPW_PACKAGE_PROPERTY:
-		packages = 
+		packages =
 			anjuta_pkg_config_chooser_get_active_packages (ANJUTA_PKG_CONFIG_CHOOSER (prop->widget));
 		str_value = NULL;
 		for (node = packages; node != NULL; node = g_list_next (node))
@@ -714,7 +725,7 @@ npw_property_set_value_from_widget (NPWProperty* prop, NPWValueTag tag)
 			g_string_free (str_value, FALSE);
 		}
 		g_list_foreach (packages, (GFunc) g_free, NULL);
-		g_list_free (packages);	
+		g_list_free (packages);
 		break;
 	default:
 		/* Hidden property */
@@ -727,7 +738,7 @@ npw_property_set_value_from_widget (NPWProperty* prop, NPWValueTag tag)
 	{
 		tag |= NPW_DEFAULT_VALUE;
 	}
-	
+
 	ok = npw_value_set_value (prop->value, value, tag);
 	if (alloc_value != NULL) g_free (alloc_value);
 
@@ -766,7 +777,7 @@ npw_property_get_value (const NPWProperty* prop)
 	{
 		/* Only value entered by user could replace default value */
 		return npw_value_get_value (prop->value);
-	}	
+	}
 }
 
 gboolean
@@ -780,7 +791,7 @@ npw_property_add_list_item (NPWProperty* prop, const gchar* name, const gchar* l
 	if (find != NULL)
 	{
 		NPWItem* old_item = (NPWItem *)find->data;
-		
+
 		if (old_item->language <= item->language)
 		{
 			npw_item_free ((NPWItem *)find->data);
@@ -971,7 +982,7 @@ NPWProperty *
 npw_page_add_property (NPWPage* page, NPWProperty *prop)
 {
 	GList *find;
-	
+
 	find = g_list_find_custom (page->properties, prop, (GCompareFunc)npw_property_compare);
 	if (find == NULL)
 	{
@@ -980,7 +991,7 @@ npw_page_add_property (NPWPage* page, NPWProperty *prop)
 	else
 	{
 		NPWProperty* old_prop = (NPWProperty *)find->data;
-		
+
 		if (old_prop->language <= prop->language)
 		{
 			npw_property_free (old_prop);
@@ -992,6 +1003,6 @@ npw_page_add_property (NPWPage* page, NPWProperty *prop)
 			prop = old_prop;
 		}
 	}
-	
+
 	return prop;
 }
diff --git a/plugins/project-wizard/property.h b/plugins/project-wizard/property.h
index 5c4633c..f1ed832 100644
--- a/plugins/project-wizard/property.h
+++ b/plugins/project-wizard/property.h
@@ -55,6 +55,7 @@ typedef enum {
 	NPW_NO_RESTRICTION = 0,
 	NPW_FILENAME_RESTRICTION,
 	NPW_DIRECTORY_RESTRICTION,
+	NPW_PRINTABLE_RESTRICTION,
 	NPW_LAST_RESTRICTION
 } NPWPropertyRestriction;
 
diff --git a/plugins/project-wizard/templates/Makefile.am b/plugins/project-wizard/templates/Makefile.am
index cc18dd0..f4f1c5a 100644
--- a/plugins/project-wizard/templates/Makefile.am
+++ b/plugins/project-wizard/templates/Makefile.am
@@ -43,6 +43,8 @@ wizard_files_DATA = \
 	pygtk-logo.png \
 	mkfile-logo.png \
 	appwiz_sdl.png \
+	gnome.png \
+	gnome.svg \
 	$(template_in_files:.wiz.in=.wiz)
 
 # Translate wiz file
diff --git a/plugins/project-wizard/templates/gnome-shell-extension.wiz.in b/plugins/project-wizard/templates/gnome-shell-extension.wiz.in
index 2070986..5643c76 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension.wiz.in
+++ b/plugins/project-wizard/templates/gnome-shell-extension.wiz.in
@@ -2,7 +2,7 @@
 	<project-wizard>
 		<_name>Gnome Shell Extension</_name>
 		<_description>A minimal Gnome Shell extension</_description>
-		<icon>terminal-logo.png</icon>
+		<icon>gnome.png</icon>
 		<category>JS</category>
 		<required-program>automake</required-program>
 		<required-program>autoconf</required-program>
@@ -10,37 +10,28 @@
 	</project-wizard>
 	
 	<page name="basic" _label="Basic information" _description="General Project Information">
-		<property type="string" name="Name" _label="Project Name:" _description="project name" default="foobar-sample" summary="yes" restriction="filename" mandatory="yes"/>
+		<property type="string" name="Name" _label="Plugin Name:" _description="Short but descriptive user-visible plugin name" default="foobar-sample" summary="yes" restriction="printable" mandatory="yes"/>
 		<property type="string" name="Author" _label="Author:" _description="" default="[+UserName+]" mandatory="yes"/>
 		<property type="string" name="Email" _label="Email address:" _description="" default="[+EmailAddress+]" mandatory="no"/>
 		<property type="string" name="Version" _label="Version:" default="0.1" mandatory="yes"/>
 	</page>
 	
-	<page name="metadata" _label="Metadata" _description="Plugin Description and Metadata">
-		<property type="string" name="PluginName" _label="Plugin Name:" _description="Short but descriptive user-visible plugin name" default="[+Name+]" summary="yes" mandatory="yes"/>
-		<property type="string" name="Description" _label="Description:" _description="Long description of your plugin" default="[+Name+]" mandatory="yes"/>
-		<property type="string" name="UUID" _label="UUID:" _description="Uuid is a globally-unique identifier for your extension.
-This should be in the format of an email address (foo bar extensions example com), but
-need not be an actual email address, though it's a good idea to base the uuid on your
-email address." default="[+Name+]-[+EmailAddress+]" mandatory="yes"/>
-		<property type="string" name="URL" _label="URL:" _description="Extension URL" default='http://mydomain.org' mandatory="yes"/>
-		<property type="string" name="Compatibility" _label="Gnome Shell Compatibility:" _description="Comma-separated list of gnome-shell version your plugin is compatible with" default='["3.2.0"]' mandatory="yes"/>
-	</page>
-	
 	<page name="options" _label="Project options" _description="Options for project build system">
-		<property type="directory" name="Destination" _label="Destination:" _description="" default='[+AnjutaProjectDirectory+]/[+(string-downcase (get "Name"))+]' mandatory="yes" exist="no" summary="yes"/>
+		<property type="directory" name="Destination" _label="Destination:" _description="" default='[+AnjutaProjectDirectory+]/[+(string-substitute (string-downcase (get "Name")) " " "-")+]' mandatory="yes" exist="no" summary="yes"/>
 		<property type="list" name="License" _label="License" _description="Select code license" default="GPL" editable="no">
 			<item name="GPL" _label="General Public License (GPL)"/>
 			<item name="LGPL" _label="Lesser General Public License (LGPL)"/>
 			<item name="BSD" _label="Berkeley Software Distribution License (BSD)"/>
 			<item name="None" _label="No license"/>
 		</property>
-		<property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
-		<property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-		<property type="hidden" name="NameCamel" default='[+(string->c-name! (string-substitute (string-capitalize (get "Name")) " " ""))+]'/>
-		<property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute (string-upcase (get "Name")) " " "_"))+]'/>
+		<property type="string" name="Description" _label="Description:" _description="Long description of your plugin" default="[+Name+]" mandatory="yes"/>
+		<property type="string" name="UUID" _label="UUID:" _description="Uuid is a globally-unique identifier for your extension.
+This should be in the format of an email address (foo bar extensions example com), but
+need not be an actual email address, though it's a good idea to base the uuid on your
+email address." default='[+(string-substitute (string->c-name! (get "Name")) " " "-")+]-[+EmailAddress+]' mandatory="yes"/>
+		<property type="string" name="URL" _label="URL:" _description="Extension URL" default='http://mydomain.org' mandatory="yes"/>
+		<property type="string" name="Compatibility" _label="Gnome Shell Compatibility:" _description="Comma-separated list of gnome-shell version your plugin is compatible with" default='3.2.0' mandatory="yes"/>
 		<property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute (string-downcase (get "Name")) " " "_"))+]'/>
-		<property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! (string-downcase (get "Name"))) " " "-")+]'/>
 	</page>
 	
 	<content>
@@ -48,7 +39,7 @@ email address." default="[+Name+]-[+EmailAddress+]" mandatory="yes"/>
 			<file source="Makefile.am.tpl" destination="Makefile.am"/>
 			<file source="autogen.sh" executable="yes"/>
 			<file source="configure.ac.tpl" destination="configure.ac"/>
-			<file source="project.anjuta" destination="[+NameHLower+].anjuta"/>
+			<file source="project.anjuta" destination="[+NameCLower+].anjuta"/>
 		</directory>
 		<directory source="gnome-shell-extension" destination="[+Destination+]">
 			<directory source="src" destination="src">
@@ -64,6 +55,6 @@ email address." default="[+Name+]-[+EmailAddress+]" mandatory="yes"/>
 	</content>
 	
 	<action>
-		<open file="[+Destination+]/[+NameHLower+].anjuta"/>
+		<open file="[+Destination+]/[+NameCLower+].anjuta"/>
 	</action>
 </project-template>
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/configure.ac.tpl b/plugins/project-wizard/templates/gnome-shell-extension/configure.ac.tpl
index 99a2d50..389bfb8 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension/configure.ac.tpl
+++ b/plugins/project-wizard/templates/gnome-shell-extension/configure.ac.tpl
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
-AC_INIT([+NameHLower+], [+Version+])
+AC_INIT([+NameCLower+], [+Version+])
 
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/src/metadata.json b/plugins/project-wizard/templates/gnome-shell-extension/src/metadata.json
index 92ea5e5..a438b64 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension/src/metadata.json
+++ b/plugins/project-wizard/templates/gnome-shell-extension/src/metadata.json
@@ -1,8 +1,8 @@
 [+ autogen5 template +]
 {
-    "shell-version": [+Compatibility+], 
+    "shell-version": [+(string-append "[\"" (string-join (map string-trim-both (string-split (string-trim-both (get "Compatibility")) #\, )) "\",\"" 'infix ) "\"]")+], 
     "uuid": "[+UUID+]", 
-    "name": "[+PluginName+]", 
+    "name": "[+Name+]", 
     "original-author": "[+Author+]",
     "url": "[+URL+]", 
     "description": "[+Description+]"
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/src/stylesheet.css b/plugins/project-wizard/templates/gnome-shell-extension/src/stylesheet.css
index 7d72bdb..95b108e 100644
--- a/plugins/project-wizard/templates/gnome-shell-extension/src/stylesheet.css
+++ b/plugins/project-wizard/templates/gnome-shell-extension/src/stylesheet.css
@@ -1,5 +1,5 @@
 [+ autogen5 template +]
-.[+NameHLower+]-label {
+.[+NameCLower+]-label {
     font-size: 36px;
     font-weight: bold;
     color: #ffffff;
diff --git a/plugins/project-wizard/templates/gnome.png b/plugins/project-wizard/templates/gnome.png
new file mode 100644
index 0000000..1524ce6
Binary files /dev/null and b/plugins/project-wizard/templates/gnome.png differ
diff --git a/plugins/project-wizard/templates/gnome.svg b/plugins/project-wizard/templates/gnome.svg
new file mode 100644
index 0000000..47d6089
--- /dev/null
+++ b/plugins/project-wizard/templates/gnome.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.0"
+   width="600"
+   height="600"
+   viewBox="0 0 95.991 150.915"
+   id="svg1360"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="Gnomelogo-footprint.svg"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   inkscape:window-height="720"
+   inkscape:window-width="1024"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="0.67833333"
+   inkscape:cx="300"
+   inkscape:cy="299.2629"
+   inkscape:window-x="0"
+   inkscape:window-y="25"
+   inkscape:current-layer="g1365"
+   showgrid="false"
+   inkscape:window-maximized="0" /><defs
+   id="defs1391">
+		
+	
+			
+			
+		</defs>
+	<g
+   style="fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+   id="g1365"
+   transform="matrix(1.213211,0,0,1.213211,-10.36596,3.720334)">
+				<g
+   id="g1367">
+					<path
+   d="M 86.068,0 C 61.466,0 56.851,35.041 70.691,35.041 C 84.529,35.041 110.671,0 86.068,0 z "
+   id="path1369" />
+					<path
+   d="M 45.217,30.699 C 52.586,31.149 60.671,2.577 46.821,4.374 C 32.976,6.171 37.845,30.249 45.217,30.699 z "
+   id="path1371" />
+					<path
+   d="M 11.445,48.453 C 16.686,46.146 12.12,23.581 3.208,29.735 C -5.7,35.89 6.204,50.759 11.445,48.453 z "
+   id="path1373" />
+					<path
+   d="M 26.212,36.642 C 32.451,35.37 32.793,9.778 21.667,14.369 C 10.539,18.961 19.978,37.916 26.212,36.642 L 26.212,36.642 z "
+   id="path1375" />
+					<path
+   d="M 58.791,93.913 C 59.898,102.367 52.589,106.542 45.431,101.092 C 22.644,83.743 83.16,75.088 79.171,51.386 C 75.86,31.712 15.495,37.769 8.621,68.553 C 3.968,89.374 27.774,118.26 52.614,118.26 C 64.834,118.26 78.929,107.226 81.566,93.248 C 83.58,82.589 57.867,86.86 58.791,93.913 L 58.791,93.913 z "
+   id="newshape" />
+				</g>
+			</g>
+</svg>
\ No newline at end of file