sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Preferences label warning about restarting after editing

Browse Source 
template data - this is no longer necessary.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5743 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2011-04-26 16:39:41 +00:00
parent 9bdd1663f4
commit d7277f17bc
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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>

14
doc/geany.html
View File

@ -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 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
<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 @@ to the specified command.</dd>
<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-&gt;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 @@ also force this by selecting <em>Tools-&gt;Reload Configuration</em>.</p>
meta data is only used for the ChangeLog and File header templates.</p>
<p>In the configuration dialog you can find a tab &quot;Templates&quot; (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-&gt;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 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
<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>

7
doc/geany.txt
View File

@ -2323,10 +2323,6 @@ 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.
.. 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 @@ meta data is only used for the ChangeLog and File header templates.
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

5
src/prefs.c
View File

@ -1651,11 +1651,6 @@ void prefs_show_dialog(void)
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);