SF.net SVN: geany: [791] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Tue Sep 5 16:55:52 UTC 2006


Revision: 791
          http://svn.sourceforge.net/geany/?rev=791&view=rev
Author:   eht16
Date:     2006-09-05 09:55:40 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Added new file template for filetype HTML.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c
    trunk/src/filetypes.c
    trunk/src/templates.c
    trunk/src/templates.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-09-05 14:24:47 UTC (rev 790)
+++ trunk/ChangeLog	2006-09-05 16:55:40 UTC (rev 791)
@@ -1,3 +1,9 @@
+2006-09-05  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/templates.c, src/document.c, src/filetypes.c:
+   Added new file template for filetype HTML.
+
+
 2006-09-05  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/utils.c, src/utils.h, src/ui_utils.c, src/ui_utils.h,

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2006-09-05 14:24:47 UTC (rev 790)
+++ trunk/src/document.c	2006-09-05 16:55:40 UTC (rev 791)
@@ -1186,6 +1186,14 @@
 				g_free(tmp);
 				break;
 			}
+			case GEANY_FILETYPES_HTML:
+			{	// HTML: include the comment in <!-- --> - tags
+				gchar *tmp = templates_get_template_fileheader(
+						GEANY_TEMPLATE_FILEHEADER, ft->extension, -1);
+				gpl_notice = g_strconcat("<!--\n", tmp, "-->\n\n", NULL);
+				g_free(tmp);
+				break;
+			}
 			case GEANY_FILETYPES_PASCAL:
 			{	// Pascal: comments are in { } brackets
 				gpl_notice = templates_get_template_fileheader(

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2006-09-05 14:24:47 UTC (rev 790)
+++ trunk/src/filetypes.c	2006-09-05 16:55:40 UTC (rev 791)
@@ -134,7 +134,6 @@
 	filetypes[GEANY_FILETYPES_C]->style_func_ptr = styleset_c;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_C]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_C]->title, filetypes[GEANY_FILETYPES_C]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_C]->title, filetypes[GEANY_FILETYPES_C]);
 
 #define CPP
 	filetypes[GEANY_FILETYPES_CPP] = g_new0(filetype, 1);
@@ -163,7 +162,6 @@
 	filetypes[GEANY_FILETYPES_CPP]->comment_close = NULL;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CPP]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CPP]->title, filetypes[GEANY_FILETYPES_CPP]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_CPP]->title, filetypes[GEANY_FILETYPES_CPP]);
 
 #define D
 	filetypes[GEANY_FILETYPES_D] = g_new0(filetype, 1);
@@ -184,7 +182,6 @@
 	filetypes[GEANY_FILETYPES_D]->style_func_ptr = styleset_d;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_D]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]);
 
 #define JAVA
 	filetypes[GEANY_FILETYPES_JAVA] = g_new0(filetype, 1);
@@ -204,7 +201,6 @@
 	filetypes[GEANY_FILETYPES_JAVA]->style_func_ptr = styleset_java;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_JAVA]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_JAVA]->title, filetypes[GEANY_FILETYPES_JAVA]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_JAVA]->title, filetypes[GEANY_FILETYPES_JAVA]);
 
 #define PAS // to avoid warnings when building under Windows, the symbol PASCAL is there defined
 	filetypes[GEANY_FILETYPES_PASCAL] = g_new0(filetype, 1);
@@ -228,7 +224,6 @@
 	filetypes[GEANY_FILETYPES_PASCAL]->comment_close = g_strdup("}");
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PASCAL]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]);
 
 #define ASM
 	filetypes[GEANY_FILETYPES_ASM] = g_new0(filetype, 1);
@@ -336,7 +331,6 @@
 	filetypes[GEANY_FILETYPES_PHP]->comment_close = NULL;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PHP]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PHP]->title, filetypes[GEANY_FILETYPES_PHP]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PHP]->title, filetypes[GEANY_FILETYPES_PHP]);
 
 #define PYTHON
 	filetypes[GEANY_FILETYPES_PYTHON] = g_new0(filetype, 1);
@@ -377,7 +371,6 @@
 	filetypes[GEANY_FILETYPES_RUBY]->comment_close = NULL;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_RUBY]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]);
 
 #define TCL
 	filetypes[GEANY_FILETYPES_TCL] = g_new0(filetype, 1);
@@ -527,7 +520,6 @@
 	filetypes[GEANY_FILETYPES_HTML]->comment_close = g_strdup("-->");
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_HTML]);
 	filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_HTML]->title, filetypes[GEANY_FILETYPES_HTML]);
-	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_HTML]->title, filetypes[GEANY_FILETYPES_HTML]);
 
 #define CSS
 	filetypes[GEANY_FILETYPES_CSS] = g_new0(filetype, 1);
@@ -668,6 +660,25 @@
 	filetypes[GEANY_FILETYPES_ALL]->comment_close = NULL;
 	filetypes_init_build_programs(filetypes[GEANY_FILETYPES_ALL]);
 	filetypes_create_menu_item(filetype_menu, _("None"), filetypes[GEANY_FILETYPES_ALL]);
+
+	// now add the items for the new file menu
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_C]->title,
+																filetypes[GEANY_FILETYPES_C]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_CPP]->title,
+																filetypes[GEANY_FILETYPES_CPP]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_D]->title,
+																filetypes[GEANY_FILETYPES_D]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_JAVA]->title,
+																filetypes[GEANY_FILETYPES_JAVA]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PASCAL]->title,
+																filetypes[GEANY_FILETYPES_PASCAL]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_RUBY]->title,
+																filetypes[GEANY_FILETYPES_RUBY]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PHP]->title,
+																filetypes[GEANY_FILETYPES_PHP]);
+	filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_HTML]->title,
+																filetypes[GEANY_FILETYPES_HTML]);
+
 }
 
 
@@ -821,6 +832,8 @@
 			return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_RUBY); break;
 		case GEANY_FILETYPES_D:
 			return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_D); break;
+		case GEANY_FILETYPES_HTML:
+			return templates_get_template_generic(GEANY_TEMPLATE_FILETYPE_HTML); break;
 		default: return NULL;
 	}
 }

Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c	2006-09-05 14:24:47 UTC (rev 790)
+++ trunk/src/templates.c	2006-09-05 16:55:40 UTC (rev 791)
@@ -63,6 +63,7 @@
 	gchar *template_filename_filetype_java = templates_get_filename("template.filetype.java");
 	gchar *template_filename_filetype_pascal = templates_get_filename("template.filetype.pascal");
 	gchar *template_filename_filetype_php = templates_get_filename("template.filetype.php");
+	gchar *template_filename_filetype_html = templates_get_filename("template.filetype.html");
 	gchar *template_filename_filetype_ruby = templates_get_filename("template.filetype.ruby");
 
 	time_t tp = time(NULL);
@@ -92,6 +93,7 @@
 	templates_create_file(template_filename_filetype_java, templates_filetype_java);
 	templates_create_file(template_filename_filetype_pascal, templates_filetype_pascal);
 	templates_create_file(template_filename_filetype_php, templates_filetype_php);
+	templates_create_file(template_filename_filetype_html, templates_filetype_html);
 	templates_create_file(template_filename_filetype_ruby, templates_filetype_ruby);
 
 	// read the contents
@@ -156,6 +158,9 @@
 	templates_read_file(template_filename_filetype_php, &templates[GEANY_TEMPLATE_FILETYPE_PHP]);
 	templates[GEANY_TEMPLATE_FILETYPE_PHP] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_PHP], year, date);
 
+	templates_read_file(template_filename_filetype_html, &templates[GEANY_TEMPLATE_FILETYPE_HTML]);
+	templates[GEANY_TEMPLATE_FILETYPE_HTML] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_HTML], year, date);
+
 	templates_read_file(template_filename_filetype_ruby, &templates[GEANY_TEMPLATE_FILETYPE_RUBY]);
 	templates[GEANY_TEMPLATE_FILETYPE_RUBY] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_RUBY], year, date);
 
@@ -182,6 +187,7 @@
 	g_free(template_filename_filetype_d);
 	g_free(template_filename_filetype_java);
 	g_free(template_filename_filetype_php);
+	g_free(template_filename_filetype_html);
 	g_free(template_filename_filetype_pascal);
 	g_free(template_filename_filetype_ruby);
 }

Modified: trunk/src/templates.h
===================================================================
--- trunk/src/templates.h	2006-09-05 14:24:47 UTC (rev 790)
+++ trunk/src/templates.h	2006-09-05 16:55:40 UTC (rev 791)
@@ -63,6 +63,7 @@
 	GEANY_TEMPLATE_FILETYPE_PASCAL,
 	GEANY_TEMPLATE_FILETYPE_RUBY,
 	GEANY_TEMPLATE_FILETYPE_D,
+	GEANY_TEMPLATE_FILETYPE_HTML,
 
 	GEANY_MAX_TEMPLATES
 };
@@ -234,6 +235,22 @@
 </html>\n\
 ";
 
+static const gchar templates_filetype_html[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n\
+  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\
+<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n\
+\n\
+<head>\n\
+	<title>{untitled}</title>\n\
+	<meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\" />\n\
+	<meta name=\"generator\" content=\"{geanyversion}\" />\n\
+</head>\n\
+\n\
+<body>\n\
+\n\
+</body>\n\
+</html>\n\
+";
+
 static const gchar templates_filetype_pascal[] = "program {untitled};\n\
 \n\
 uses crt;\n\


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



More information about the Commits mailing list