SF.net SVN: geany:[5743] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Tue Apr 26 16:39:41 UTC 2011
Revision: 5743
http://geany.svn.sourceforge.net/geany/?rev=5743&view=rev
Author: ntrel
Date: 2011-04-26 16:39:41 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
Remove Preferences label warning about restarting after editing
template data - this is no longer necessary.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/prefs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-04-26 16:21:47 UTC (rev 5742)
+++ trunk/ChangeLog 2011-04-26 16:39:41 UTC (rev 5743)
@@ -10,6 +10,9 @@
Change Programming Languages filetype group label -> Compiled
Languages.
Use 'source file' title for custom filetypes.
+ * src/prefs.c, doc/geany.txt, doc/geany.html:
+ Remove Preferences label warning about restarting after editing
+ template data - this is no longer necessary.
2011-04-26 Colomban Wendling <colomban(at)geany(dot)org>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2011-04-26 16:21:47 UTC (rev 5742)
+++ trunk/doc/geany.html 2011-04-26 16:39:41 UTC (rev 5743)
@@ -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="2011-04-01" />
+<meta name="date" content="2011-04-02" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2011-04-01</td></tr>
+<td>2011-04-02</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.21</td></tr>
</tbody>
@@ -2641,11 +2641,6 @@
<p>This data is used as meta data for various template text to insert into
a document, such as the file header. You only need to set fields that
you want to use in your template files.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">For changes made here to take effect, you must either select
-<em>Tools->Reload Configuration</em> or restart Geany.</p>
-</div>
<img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" />
<div class="section">
<h4><a class="toc-backref" href="#id122" id="template-data" name="template-data">Template data</a></h4>
@@ -5270,8 +5265,7 @@
meta data is only used for the ChangeLog and File header templates.</p>
<p>In the configuration dialog you can find a tab "Templates" (see
<a class="reference" href="#template-preferences">Template preferences</a>). You can define the default values
-which will be inserted in the templates. You should select
-<em>Tools->Reload Configuration</em> or restart Geany after making changes.</p>
+which will be inserted in the templates.</p>
</div>
<div class="section">
<h3><a class="toc-backref" href="#id204" id="file-templates" name="file-templates">File templates</a></h3>
@@ -6540,7 +6534,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2011-04-01 16:25 UTC.
+Generated on: 2011-04-26 16:36 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 2011-04-26 16:21:47 UTC (rev 5742)
+++ trunk/doc/geany.txt 2011-04-26 16:39:41 UTC (rev 5743)
@@ -2323,10 +2323,6 @@
a document, such as the file header. You only need to set fields that
you want to use in your template files.
-.. note::
- For changes made here to take effect, you must either select
- *Tools->Reload Configuration* or restart Geany.
-
.. image:: ./images/pref_dialog_templ.png
Template data
@@ -4506,8 +4502,7 @@
In the configuration dialog you can find a tab "Templates" (see
`Template preferences`_). You can define the default values
-which will be inserted in the templates. You should select
-*Tools->Reload Configuration* or restart Geany after making changes.
+which will be inserted in the templates.
File templates
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2011-04-26 16:21:47 UTC (rev 5742)
+++ trunk/src/prefs.c 2011-04-26 16:39:41 UTC (rev 5743)
@@ -1651,11 +1651,6 @@
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, "vbox31")),
label, FALSE, TRUE, 5);
- label = geany_wrap_label_new(_("<i>Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration.</i>"));
- gtk_widget_show(label);
- gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, "vbox9")),
- label, FALSE, TRUE, 5);
/* page Keybindings */
label = geany_wrap_label_new(_("Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly."));
gtk_widget_show(label);
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