Revision: 4874 http://geany.svn.sourceforge.net/geany/?rev=4874&view=rev Author: ntrel Date: 2010-05-05 13:06:53 +0000 (Wed, 05 May 2010)

Log Message: ----------- Add {project}, {description} template wildcards (#2954737).

Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/templates.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-05 12:50:59 UTC (rev 4873) +++ trunk/ChangeLog 2010-05-05 13:06:53 UTC (rev 4874) @@ -5,6 +5,8 @@ Fix replacing {filename} template wildcard for custom file templates with non-default file extension. Add search_find_text() for POSIX regex searches. + * src/templates.c, doc/geany.txt, doc/geany.html: + Add {project}, {description} template wildcards (#2954737).

2010-05-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-05-05 12:50:59 UTC (rev 4873) +++ trunk/doc/geany.html 2010-05-05 13:06:53 UTC (rev 4874) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-04-28" /> +<meta name="date" content="2010-05-05" /> <style type="text/css">

/* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-04-28</td></tr> +<td>2010-05-05</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.19</td></tr> </tbody> @@ -4980,6 +4980,14 @@ <td>file header, snippets, file templates.</td> </tr> +<tr><td>project</td> +<td>The current project's name, if any.</td> +<td>file header, snippets, file templates.</td> +</tr> +<tr><td>description</td> +<td>The current project's description, if any.</td> +<td>file header, snippets, file templates.</td> +</tr> <tr><td>gpl</td> <td>This wildcard inserts a short GPL notice.</td> <td>file header.</td> @@ -6011,7 +6019,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-05-05 12:43 UTC. +Generated on: 2010-05-05 13:02 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.

</div>

Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-05-05 12:50:59 UTC (rev 4873) +++ trunk/doc/geany.txt 2010-05-05 13:06:53 UTC (rev 4874) @@ -4286,6 +4286,10 @@ Only replaced when first saving if found on templates. the first 3 lines of the file.

+project The current project's name, if any. file header, snippets, file templates. + +description The current project's description, if any. file header, snippets, file templates. + gpl This wildcard inserts a short GPL notice. file header.

bsd This wildcard inserts a BSD licence notice. file header.

Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2010-05-05 12:50:59 UTC (rev 4873) +++ trunk/src/templates.c 2010-05-05 13:06:53 UTC (rev 4874) @@ -39,6 +39,7 @@ #include "ui_utils.h" #include "toolbar.h" #include "geanymenubuttonaction.h" +#include "project.h"

GeanyTemplatePrefs template_prefs; @@ -307,6 +308,8 @@

templates_replace_valist(template, "{filename}", shortname, + "{project}", app->project ? app->project->name : "", + "{description}", app->project ? app->project->description : "", NULL); g_free(shortname);

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