# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1462271181 -3600
# Node ID 9c50e8a0cbe08b3ced0c66ba6e5df10170d78014
# Parent  1dbc3665fa464dcb0f53c42093e1ad47b42f950b# Parent  30a6d289624c6080b04b0b94e367ac9cd1466377
Merge Colins changes

* 'master' of git://www.geeqie.org/geeqie:
  Document toolbar enhancements

diff -r 1dbc3665fa46 -r 9c50e8a0cbe0 doc/docbook/GuideReference.xml
--- a/doc/docbook/GuideReference.xml	Tue May 03 11:17:49 2016 +0100
+++ b/doc/docbook/GuideReference.xml	Tue May 03 11:26:21 2016 +0100
@@ -7,5 +7,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceKeyboardShortcuts.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceThumbnails.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceManagement.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceToolbar.xml"/>
 
   <para/></chapter>
diff -r 1dbc3665fa46 -r 9c50e8a0cbe0 doc/docbook/GuideReferenceToolbar.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/docbook/GuideReferenceToolbar.xml	Tue May 03 11:26:21 2016 +0100
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section id="GuideReferenceToolbar">
+    <title>
+      Toolbar
+    </title>
+    <para/><section id="AddingIconsToToolbar"><title>How to set up new toolbar icons
+    </title>
+    <para>This section describes how to put additional icons on the toolbar.<para/>The functions these icons may initiate are as described in <link linkend="GuideImageManagementExternalEditing">External Editors</link>.
+    </para>
+    <para>
+      Edit the toolbar section of the file geeqierc.xml to include a reference to the new icon:</para>
+    <para><programlisting>
+    &lt;toolitem action = "new_icon_1.desktop" /&gt;
+    </programlisting></para><para>
+      Create a corresponding desktop file as described in <link linkend="GuideImageManagementExternalEditing">External Editors</link>.
+    </para>
+    <para/>
+    <para>Within the desktop file it is recommended that two additional items are included:</para>
+    <para><programlisting>Icon=new_icon_1.png</programlisting></para>
+    <para>The icon displayed. If an icon is not defined, it is likely that the display of the entire toolbar will be distorted by additional text.</para>
+    <para><programlisting>Comment=descriptive text</programlisting></para>
+    <para>The tooltip text displayed when the mouse is hovered over the icon.</para>
+    </section>
+</section>