Git commit 5324ede94788ba0cc5b038e9823d56e56e72a6d2 by Gilles Caulier.
Committed on 23/08/2016 at 16:05.
Pushed by cgilles into branch 'master'.

rename PNG

M  +2    -3    digikam/editor-colormanagement.docbook
R  +-    --    digikam/editor-zoombuttons.png [from: 
digikam/editorzoombuttons.png - 100% similarity]
M  +1    -1    digikam/index.docbook
M  +1    -1    digikam/intro-fileformats.docbook
R  +-    --    digikam/using-mainwindow-advsearch.png [from: 
digikam/maininterfacesearchview.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-albumproperties.png [from: 
digikam/maininterfacealbumproperties.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-assigntags.png [from: 
digikam/maininterfaceassigntags.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-dateview.png [from: 
digikam/maininterfacedateview.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-duplicates-albumsfilter.png [from: 
digikam/duplicates_albumsfilter.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-filters.png [from: 
digikam/maininterfacequicksearch.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-iconview.png [from: 
digikam/maininterfacepreview.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-mapsearch.png [from: 
digikam/sidebargeolocation.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-preview.png [from: 
digikam/maininterfaceview.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-searchsimilar.png [from: 
digikam/fuzzysearchsimilar.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-searchview.png [from: 
digikam/searchinterface.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-tagsview.png [from: 
digikam/maininterfacetagsview.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-timeline.png [from: 
digikam/timeline.png - 100% similarity]
R  +-    --    digikam/using-mainwindow-toolbar.png [from: 
digikam/maininterfacetoolbar.png - 100% similarity]
M  +125  -109  digikam/using-mainwindow.docbook

http://commits.kde.org/digikam-doc/5324ede94788ba0cc5b038e9823d56e56e72a6d2

diff --git a/digikam/editor-colormanagement.docbook 
b/digikam/editor-colormanagement.docbook
index 01670f3..5c1e1cd 100644
--- a/digikam/editor-colormanagement.docbook
+++ b/digikam/editor-colormanagement.docbook
@@ -1,7 +1,6 @@
- <sect1 id="raw-decoding">           <title>RAW File Treatment and Color 
Management</title>
+ <sect1 id="raw-decoding"> <title>RAW File Treatment and Color 
Management</title>
 
-     <note><para>This article/tutorial has mainly been authored by Elle Stone, 
thanks Elle for that contribution. I merely adapted it to &digikam;'s concrete 
implementation.</para></note>
-    <sect2 id="CM-intro">            <title>Introduction</title>
+    <sect2 id="CM-intro"> <title>Introduction</title>
       <para>The point of a color-managed workflow is to ensure that the colors 
coming from your camera or scanner have a predictable relationship with the 
colors you actually photographed or scanned, that the colors displayed on your 
monitor match the colors coming from your camera or scanner, and that the 
colors you print or display on the web match the colors you produced in your 
digital darkroom.</para>
 
       <sect3 id="buttons-to-push">     <title>Which buttons do I push?</title>
diff --git a/digikam/editorzoombuttons.png b/digikam/editor-zoombuttons.png
similarity index 100%
rename from digikam/editorzoombuttons.png
rename to digikam/editor-zoombuttons.png
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 084a567..a6982a9 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -102,7 +102,7 @@
     &doc-intro-fileformats;
     &doc-intro-camerasupport;
     &doc-intro-pluginsupport;
-    
+
 </chapter>
 
 <!-- *********************************************************************** 
-->
diff --git a/digikam/intro-fileformats.docbook 
b/digikam/intro-fileformats.docbook
index 61caba3..6171799 100644
--- a/digikam/intro-fileformats.docbook
+++ b/digikam/intro-fileformats.docbook
@@ -80,7 +80,7 @@
             </para>
 
             <para>
-            If you want to learn more about RAW image format visit the very 
helpful guides<ulink url="http://en.wikipedia.org/wiki/RAW_image_format";> 
Wikipedia,</ulink> <ulink 
url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml";>
 The Luminous Landscape,</ulink> and <ulink 
url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm";> Cambridge 
in Colour</ulink>. You can convert RAW format images into JPEG, PNG, or TIFF in 
&digikam; using the <link linkend="bqm-rawworkflow">Batch Queue Manager</link>.
+            If you want to learn more about RAW image format visit the very 
helpful guides<ulink url="http://en.wikipedia.org/wiki/RAW_image_format";> 
Wikipedia,</ulink> <ulink 
url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml";>
 The Luminous Landscape,</ulink> and <ulink 
url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm";> Cambridge 
in Colour</ulink>. You can convert RAW format images into JPEG, PNG, or TIFF in 
&digikam; using the <link linkend="raw-workflow">Image Editor</link>.
             </para>
 
             <para>
diff --git a/digikam/maininterfacesearchview.png 
b/digikam/using-mainwindow-advsearch.png
similarity index 100%
rename from digikam/maininterfacesearchview.png
rename to digikam/using-mainwindow-advsearch.png
diff --git a/digikam/maininterfacealbumproperties.png 
b/digikam/using-mainwindow-albumproperties.png
similarity index 100%
rename from digikam/maininterfacealbumproperties.png
rename to digikam/using-mainwindow-albumproperties.png
diff --git a/digikam/maininterfaceassigntags.png 
b/digikam/using-mainwindow-assigntags.png
similarity index 100%
rename from digikam/maininterfaceassigntags.png
rename to digikam/using-mainwindow-assigntags.png
diff --git a/digikam/maininterfacedateview.png 
b/digikam/using-mainwindow-dateview.png
similarity index 100%
rename from digikam/maininterfacedateview.png
rename to digikam/using-mainwindow-dateview.png
diff --git a/digikam/duplicates_albumsfilter.png 
b/digikam/using-mainwindow-duplicates-albumsfilter.png
similarity index 100%
rename from digikam/duplicates_albumsfilter.png
rename to digikam/using-mainwindow-duplicates-albumsfilter.png
diff --git a/digikam/maininterfacequicksearch.png 
b/digikam/using-mainwindow-filters.png
similarity index 100%
rename from digikam/maininterfacequicksearch.png
rename to digikam/using-mainwindow-filters.png
diff --git a/digikam/maininterfacepreview.png 
b/digikam/using-mainwindow-iconview.png
similarity index 100%
rename from digikam/maininterfacepreview.png
rename to digikam/using-mainwindow-iconview.png
diff --git a/digikam/sidebargeolocation.png 
b/digikam/using-mainwindow-mapsearch.png
similarity index 100%
rename from digikam/sidebargeolocation.png
rename to digikam/using-mainwindow-mapsearch.png
diff --git a/digikam/maininterfaceview.png 
b/digikam/using-mainwindow-preview.png
similarity index 100%
rename from digikam/maininterfaceview.png
rename to digikam/using-mainwindow-preview.png
diff --git a/digikam/fuzzysearchsimilar.png 
b/digikam/using-mainwindow-searchsimilar.png
similarity index 100%
rename from digikam/fuzzysearchsimilar.png
rename to digikam/using-mainwindow-searchsimilar.png
diff --git a/digikam/searchinterface.png 
b/digikam/using-mainwindow-searchview.png
similarity index 100%
rename from digikam/searchinterface.png
rename to digikam/using-mainwindow-searchview.png
diff --git a/digikam/maininterfacetagsview.png 
b/digikam/using-mainwindow-tagsview.png
similarity index 100%
rename from digikam/maininterfacetagsview.png
rename to digikam/using-mainwindow-tagsview.png
diff --git a/digikam/timeline.png b/digikam/using-mainwindow-timeline.png
similarity index 100%
rename from digikam/timeline.png
rename to digikam/using-mainwindow-timeline.png
diff --git a/digikam/maininterfacetoolbar.png 
b/digikam/using-mainwindow-toolbar.png
similarity index 100%
rename from digikam/maininterfacetoolbar.png
rename to digikam/using-mainwindow-toolbar.png
diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index d269645..0671464 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -4,7 +4,7 @@
     <title>Introduction to the Main Window</title>
 
         <para>
-            <inlinemediaobject><imageobject><imagedata 
fileref="&path;maininterfacepreview.png" format="PNG" /> </imageobject>
+            <inlinemediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-preview.png" format="PNG" /> </imageobject>
             </inlinemediaobject>
         </para>
 
@@ -39,7 +39,7 @@
 
         <para>
             <inlinemediaobject>
-                <imageobject><imagedata 
fileref="&path;maininterfacetoolbar.png" format="PNG"/></imageobject>
+                <imageobject><imagedata 
fileref="&path;using-mainwindow-toolbar.png" format="PNG"/></imageobject>
                 <textobject> <phrase>The Default Main Toolbar</phrase> 
</textobject>
             </inlinemediaobject>
         </para>
@@ -91,7 +91,7 @@
         <title>Creating a New Album</title>
 
             <para>
-            There are a number of ways to create a new Album. You can create a 
new Album when you upload new photographs from the Camera using the Camera 
Tool. You can also create a new empty Album by clicking the 
<guibutton>New</guibutton> button on the tool bar. As an additional option, you 
can create a new Album by importing an existing folder of photographs from your 
computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add 
Folders...</guimenuitem></menuchoice> from the menu bar and select the folder 
that you want to import. An Album will be created with the same name as the 
hard disk folder. You can use drag and drop to import a folder. Drag a folder 
icon, for example from a &konqueror; window. Then drop it on the album list on 
the left. A menu will appear that gives you the option to move or copy the 
folder into &digikam;.
+                There are a number of ways to create a new Album. You can 
create a new Album when you upload new photographs from the Camera using the 
Camera Tool. You can also create a new empty Album by clicking the 
<guibutton>New</guibutton> button on the tool bar. As an additional option, you 
can create a new Album by importing an existing folder of photographs from your 
computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add 
Folders...</guimenuitem></menuchoice> from the menu bar and select the folder 
that you want to import. An Album will be created with the same name as the 
hard disk folder. You can use drag and drop to import a folder. Drag a folder 
icon, for example from a &konqueror; window. Then drop it on the album list on 
the left. A menu will appear that gives you the option to move or copy the 
folder into &digikam;.
             </para>
 
         </sect3>
@@ -100,7 +100,7 @@
         <title>Deleting an Album</title>
 
             <para>
-            When you delete an Album from &digikam; it will be moved into the 
internal Trash Can. As an option you could change this behavior, so that delete 
really did remove the Album and all of the photographs in it. This can be 
changed by selecting 
<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure 
&digikam;</guimenuitem></menuchoice> and selecting the Miscellaneous page. At 
the top of this page are the settings that control what happens when a 
photograph is deleted. To delete an Album right-click the Album in the 
&quot;Albums&quot; tree and select Delete Album from Hard Disk from the context 
menu.
+                When you delete an Album from &digikam; it will be moved into 
the internal Trash Can. As an option you could change this behavior, so that 
delete really did remove the Album and all of the photographs in it. This can 
be changed by selecting 
<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure 
&digikam;</guimenuitem></menuchoice> and selecting the Miscellaneous page. At 
the top of this page are the settings that control what happens when a 
photograph is deleted. To delete an Album right-click the Album in the 
&quot;Albums&quot; tree and select Delete Album from Hard Disk from the context 
menu.
             </para>
 
         </sect3>
@@ -113,9 +113,9 @@
             </para>
 
             <para>
-            If you have a scanner configured, you can also scan a photograph 
straight into an Album. Select
-            <menuchoice><guimenu>Import</guimenu>
-            <guimenuitem>Import from Scanner...</guimenuitem></menuchoice>.
+                If you have a scanner configured, you can also scan a 
photograph straight into an Album. Select
+                <menuchoice><guimenu>Import</guimenu>
+                <guimenuitem>Import from Scanner...</guimenuitem></menuchoice>.
             </para>
 
         </sect3>
@@ -124,7 +124,7 @@
         <title>Moving or Copying Photographs Between Albums</title>
 
             <para>
-            Simply drag the photograph and drop it on the destination Album to 
move or copy it from one Album to another. A menu will appear that gives you 
the option to <guilabel>Move</guilabel> or <guilabel>Copy</guilabel> the 
photograph. You can move or copy multiple photographs the same way, just select 
all the photographs that you want to move and drag them on to the destination 
Album.
+                Simply drag the photograph and drop it on the destination 
Album to move or copy it from one Album to another. A menu will appear that 
gives you the option to <guilabel>Move</guilabel> or <guilabel>Copy</guilabel> 
the photograph. You can move or copy multiple photographs the same way, just 
select all the photographs that you want to move and drag them on to the 
destination Album.
             </para>
 
         </sect3>
@@ -142,7 +142,7 @@
 
             <example>
                 <title>The Album Properties Dialog</title>
-                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;maininterfacealbumproperties.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-albumproperties.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
 
             <itemizedlist>
@@ -200,17 +200,17 @@
             <para>
             The Image Window provides the main view of your images. When you 
select an Album the images contained in that Album will be displayed in the 
Image Window. Each image is displayed as a thumbnail. You can alter the size of 
the thumbnails using the magnifier slider in the lower right of the status bar.
             <inlinemediaobject>
-                <imageobject><imagedata fileref="&path;editorzoombuttons.png" 
format="PNG"/></imageobject>
+                <imageobject><imagedata fileref="&path;editor-zoombuttons.png" 
format="PNG"/></imageobject>
                 <textobject> <phrase>The thumbnail size slider</phrase> 
</textobject>
             </inlinemediaobject>
             </para>
 
             <para>
-            The first time you select an Album you may have to wait briefly 
while the thumbnails are generated, unless you used the
-                    <menuchoice>
-                            <guimenu>Tools</guimenu>
-                            <guimenuitem>Rebuild all 
Thumbnails...</guimenuitem>
-                    </menuchoice> menu item beforehand.
+                The first time you select an Album you may have to wait 
briefly while the thumbnails are generated, unless you used the
+                <menuchoice>
+                        <guimenu>Tools</guimenu>
+                        <guimenuitem>Rebuild all Thumbnails...</guimenuitem>
+                </menuchoice> menu item beforehand.
             </para>
 
             <para>
@@ -257,7 +257,7 @@
                 <shortcut><keycombo 
action="press"><keycap>F3</keycap></keycombo></shortcut>
                     <guimenu></guimenu></menuchoice> puts you back into the 
main window.
             <inlinemediaobject>
-                <imageobject><imagedata fileref="&path;maininterfaceview.png" 
format="PNG"/></imageobject>
+                <imageobject><imagedata 
fileref="&path;using-mainwindow-preview.png" format="PNG"/></imageobject>
                 <textobject> <phrase>The viewer with thumbnail slider 
below</phrase> </textobject>
             </inlinemediaobject>
                 </para>
@@ -355,7 +355,7 @@
 
     <sect2 id="using-mydatesview">       <title>Calendar View</title>
 
-        <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;maininterfacedateview.png" format="PNG" /> </imageobject>
+        <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-dateview.png" format="PNG" /> </imageobject>
             <textobject><phrase>Dates View from Main 
Window</phrase></textobject></inlinemediaobject>
         </para>
 
@@ -372,82 +372,87 @@
 
     </sect2>
 
-    <sect2 id="using-mytagsview">        <title>Tags View (Keywords)</title>
+    <sect2 id="using-mytagsview"> <title>Tags View (Keywords)</title>
 
-      <para>
-        (Hierarchical) tagging provides a flexible and powerful way to 
organize and catalog your images. Tags are labels that can be applied to 
individual images or whole groups. Once a tag has been set to an image it can 
be found again by selecting the tag or doing a search.
-      </para>
+        <para>
+            (Hierarchical) tagging provides a flexible and powerful way to 
organize and catalog your images. Tags are labels that can be applied to 
individual images or whole groups. Once a tag has been set to an image it can 
be found again by selecting the tag or doing a search.
+        </para>
 
-            <example> <title>Selecting a tag and applying a new one</title>
-                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;maininterfacetagsview.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
-            </example>
+        <example> <title>Selecting a tag and applying a new one</title>
+            <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-tagsview.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+        </example>
 
-      <para>When a tag is selected, all of the images that are marked with 
that tag are displayed.     </para>
+        <para>
+            When a tag is selected, all of the images that are marked with 
that tag are displayed.
+        </para>
 
-      <para>
-         Tags can be arranged in a hierarchical tree. This allows you to 
organize your tags in a logical manner. One can collapse parts of the tree in 
the &quot;Tags&quot; list so that one can easily find the tags that you are 
looking for.
-      </para>
+        <para>
+            Tags can be arranged in a hierarchical tree. This allows you to 
organize your tags in a logical manner. One can collapse parts of the tree in 
the &quot;Tags&quot; list so that one can easily find the tags that you are 
looking for.
+        </para>
 
-             <tip>
-              <para>Tags are stored in a database for fast access, and, the 
applied tags are written into IPTC data fields of the image (at least for 
JPEG). So can use your tags with other programs or, in case of loss of that 
data in the database, the tags will be re-imported when the image is noticed by 
&digikam;.</para></tip>
+        <tip>
+            <para>
+                Tags are stored in a database for fast access, and, the 
applied tags are written into IPTC data fields of the image (at least for 
JPEG). So can use your tags with other programs or, in case of loss of that 
data in the database, the tags will be re-imported when the image is noticed by 
&digikam;.
+            </para>
+        </tip>
 
-      <sect3 id="using-managetags">          <title>Managing Tags</title>
+        <sect3 id="using-managetags">          <title>Managing Tags</title>
 
-         <para>
-           You can add new tags by right-clicking on either the 
&quot;Tags&quot; label or an existing tag and selecting <guilabel>New 
Tag</guilabel>. If you add a new tag by right-clicking on an existing tag, your 
new tag will be created as a sub-tag.
-         </para>
+            <para>
+                You can add new tags by right-clicking on either the 
&quot;Tags&quot; label or an existing tag and selecting <guilabel>New 
Tag</guilabel>. If you add a new tag by right-clicking on an existing tag, your 
new tag will be created as a sub-tag.
+            </para>
 
-         <para>
-           You can delete a Tag by right-clicking on the Tag you want to 
delete and selecting <guilabel>Delete</guilabel> Tag. When you delete a tag, 
the photographs themselves are not deleted. Simply the tag is removed from 
those photographs.
-         </para>
+            <para>
+                You can delete a Tag by right-clicking on the Tag you want to 
delete and selecting <guilabel>Delete</guilabel> Tag. When you delete a tag, 
the photographs themselves are not deleted. Simply the tag is removed from 
those photographs.
+            </para>
 
-         <para>
-           You can move the position of a Tag within the tree by dragging it 
to the position that you want and dropping it there. A menu will appear that 
gives you the option to
-           <guilabel>Move</guilabel> the tag. This works from the left and 
right sidebar. A tag can only be in one place in the tree at a time.
-         </para>
+            <para>
+                You can move the position of a Tag within the tree by dragging 
it to the position that you want and dropping it there. A menu will appear that 
gives you the option to
+                <guilabel>Move</guilabel> the tag. This works from the left 
and right sidebar. A tag can only be in one place in the tree at a time.
+            </para>
 
-         <para>
-           You can set the Tag Properties by right-clicking on a Tag and 
selecting <guilabel>Edit Tag Properties</guilabel>. The Tag Properties allow 
you to change the name of the tag and the icon used in the &quot;Tags&quot; 
tree.
-         </para>
+            <para>
+                You can set the Tag Properties by right-clicking on a Tag and 
selecting <guilabel>Edit Tag Properties</guilabel>. The Tag Properties allow 
you to change the name of the tag and the icon used in the &quot;Tags&quot; 
tree.
+            </para>
 
-         <para>
-           To select a different photograph as the tag icon, right-click on 
the photograph that you want to use as the tag icon and select "Set as Tag 
Thumbnail" from the context menu. Additionally you can use drag and drop to set 
the tag icon. Drag the images icon and drop it on the currently selected tag in 
the tag list.
-         </para>
+            <para>
+                To select a different photograph as the tag icon, right-click 
on the photograph that you want to use as the tag icon and select "Set as Tag 
Thumbnail" from the context menu. Additionally you can use drag and drop to set 
the tag icon. Drag the images icon and drop it on the currently selected tag in 
the tag list.
+            </para>
 
-       </sect3>
+        </sect3>
 
-       <sect3 id="using-taggingimages">           <title>Tagging 
Photographs</title>
+        <sect3 id="using-taggingimages">           <title>Tagging 
Photographs</title>
 
-         <para>
-           Before you can get the most out of &digikam;'s Tagging 
capabilities, you must first tag your photographs. There are two methods of 
tagging photographs. Once you have identified the photographs that you want to 
tag you can either drag and drop them onto the Tag in the "My Tags" tree or, by 
right-clicking on the selected photographs in the Image Window, you can use the 
<guilabel>Assign Tag</guilabel> menu to select the Tags you wish to set.
-         </para>
+            <para>
+                Before you can get the most out of &digikam;'s Tagging 
capabilities, you must first tag your photographs. There are two methods of 
tagging photographs. Once you have identified the photographs that you want to 
tag you can either drag and drop them onto the Tag in the "My Tags" tree or, by 
right-clicking on the selected photographs in the Image Window, you can use the 
<guilabel>Assign Tag</guilabel> menu to select the Tags you wish to set.
+            </para>
 
-         <para>
-           You can label a photograph with as many tags as you like. The 
photograph will appear when you select any of the tags that are set against it. 
This way you can set a tag for each person in a photograph, as well as the 
place the photograph was taken, the event it was taken at, &etc;
-         </para>
+            <para>
+                You can label a photograph with as many tags as you like. The 
photograph will appear when you select any of the tags that are set against it. 
This way you can set a tag for each person in a photograph, as well as the 
place the photograph was taken, the event it was taken at, &etc;
+            </para>
 
-           <example> <title>Tagging Image with context menu, or with 
drag&amp;drop  from either sidebar</title>
-           <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;maininterfaceassigntags.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
-           </example>
+            <example> <title>Tagging Image with context menu, or with 
drag&amp;drop  from either sidebar</title>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-assigntags.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            </example>
 
-         <para>
-           Once you have tagged a photograph, the tag name will appear under 
the thumbnail in the Image Window.
-         </para>
+            <para>
+                Once you have tagged a photograph, the tag name will appear 
under the thumbnail in the Image Window.
+            </para>
 
-         <para>
-            You can remove a tag from a photograph by right-clicking on the 
photograph and using the <guilabel>Remove</guilabel> Tag menu. This menu will 
only show those tags that have been set on this photograph.
-         </para>
+            <para>
+                You can remove a tag from a photograph by right-clicking on 
the photograph and using the <guilabel>Remove</guilabel> Tag menu. This menu 
will only show those tags that have been set on this photograph.
+            </para>
 
-            </sect3>
+        </sect3>
 
-        </sect2>
+    </sect2>
 
     <sect2> <title>The Timeline</title>
 
         <para>
             The timeline view shows a timescale-adjustable histogram of the 
numbers of images per time unit. A selection frame moves over the histogram. To 
select a time frame just click into the <emphasis>lower square</emphasis> of 
the selection frame where the time unit is indicated. That will show all 
corresponding images in the main window.
         </para>
-        
+
         <para>
             In the field right below you can enter a title and save your 
selection. It will then appear in the list field at the bottom.
         </para>
@@ -455,64 +460,70 @@
         <example>
 
             <title>The Timeline View in Action</title>
-            <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;timeline.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+            <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-timeline.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
 
         </example>
 
     </sect2>
 
-    <sect2 id="using-mysearchesview">        <title>Searches View</title>
+    <sect2 id="using-mysearchesview"> <title>Searches View</title>
 
-        <sect3>
-        <title>The Quick Search</title>
+        <sect3> <title>The Quick Search</title>
         <anchor id="quicksearchtool.anchor"/>
 
             <para>
-            Quick Search is a little box in the status bar and provides you 
with a simple means to search all data fields in the album library with a 
single query. You can enter any arguments in the <guilabel>Search</guilabel> 
text field and it will be used to determine the results. For instance, you can 
enter the string 'birthday' to search the complete album library for 
occurrences of the word 'birthday' in all photograph descriptions, or '05.png' 
to search for a specific image file name '05.png' (no escaping as in 
regexpressions needed).
+                Quick Search is a little box in the status bar and provides 
you with a simple means to search all data fields in the album library with a 
single query. You can enter any arguments in the <guilabel>Search</guilabel> 
text field and it will be used to determine the results. For instance, you can 
enter the string 'birthday' to search the complete album library for 
occurrences of the word 'birthday' in all photograph descriptions, or '05.png' 
to search for a specific image file name '05.png' (no escaping as in 
regexpressions needed).
             </para>
 
             <para>Search Properties:<itemizedlist>
-                    <listitem><para>searches are case 
insensitive</para></listitem>
-                    <listitem><para>blank separated search terms are boolean 
AND combinations</para></listitem>
-                    <listitem><para>special characters are literal and not 
interpreted ( . * ? / &etc;)</para></listitem>
-                    <listitem><para>include all elements of the database: 
names, rating, keywords, tags, albums, collections, dates (and more in the 
future)</para></listitem>
-                    </itemizedlist>
+                <listitem><para>searches are case insensitive</para></listitem>
+                <listitem><para>blank separated search terms are boolean AND 
combinations</para></listitem>
+                <listitem><para>special characters are literal and not 
interpreted ( . * ? / &etc;)</para></listitem>
+                <listitem><para>include all elements of the database: names, 
rating, keywords, tags, albums, collections, dates (and more in the 
future)</para></listitem>
+                </itemizedlist>
+            </para>
+
+            <para>
+                The Quick Search really works intuitively. If you want to 
search images from a certain date, you can simply type 
<userinput>2005</userinput>, but it is even possible to search for a certain 
month. Just enter the name of the month in your local language. If it is Dutch, 
you can enter <userinput>Maart</userinput>, to see the images of March. The 
combination of 'Maart 2006' means 'Maart AND 2006' and therefore is equivalent 
to '2006 Maart'. Or look for 'Maart 2007 cr2' to find all RAW files of March 
2007.
             </para>
 
             <para>
-            The Quick Search really works intuitively. If you want to search 
images from a certain date, you can simply type <userinput>2005</userinput>, 
but it is even possible to search for a certain month. Just enter the name of 
the month in your local language. If it is Dutch, you can enter 
<userinput>Maart</userinput>, to see the images of March. The combination of 
'Maart 2006' means 'Maart AND 2006' and therefore is equivalent to '2006 
Maart'. Or look for 'Maart 2007 cr2' to find all RAW files of March 2007.
+                Next to the search box is a little LED that turns green if the 
search has results. Just click on it to reset the filtering and show all images 
again. If the search is not succeessful, the LED turns red.
             </para>
-            <para>Next to the search box is a little LED that turns green if 
the search has results. Just click on it to reset the filtering and show all 
images again. If the search is not succeessful, the LED turns red.</para>
 
             <example>
                 <title>Quick Search Tool Dialog in Action</title>
-                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;maininterfacequicksearch.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-filters.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
-            </sect3>
 
-            <sect3> <title>Searches proper</title>
+        </sect3>
+
+        <sect3> <title>Searches proper</title>
 
             <para>
-            The more sophisticated search tool is a tab on the left sidebar 
(binocular icon). If you  open it, you will be presented with a simple search 
box the works as described above, except that you can save this search as a 
live folder that always filters for what you entered as search criteria. When 
saved, the filter will appear in the list. </para>
+                The more sophisticated search tool is a tab on the left 
sidebar (binocular icon). If you  open it, you will be presented with a simple 
search box the works as described above, except that you can save this search 
as a live folder that always filters for what you entered as search criteria. 
When saved, the filter will appear in the list.
+            </para>
+
             <para>
-            When you are satisfied with your selection, click on the 
<guilabel>Ok</guilabel> button, and the search will be carried out, and the 
results displayed in "My Search" view from the main window. The <guilabel>Save 
search as</guilabel> text field will be used to label your query in "My Search" 
list. If you want to modify your selection after performing a search, simply 
right click on the item from "My Search" view and select an option from the 
pop-up menu.
+                When you are satisfied with your selection, click on the 
<guilabel>Ok</guilabel> button, and the search will be carried out, and the 
results displayed in "My Search" view from the main window. The <guilabel>Save 
search as</guilabel> text field will be used to label your query in "My Search" 
list. If you want to modify your selection after performing a search, simply 
right click on the item from "My Search" view and select an option from the 
pop-up menu.
             </para>
+
             <example>
                 <title>Quick Search Tool Dialog in Action</title>
-                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;searchinterface.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-searchview.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
 
             <para>
-            If you select <guilabel>Edit Search</guilabel>, the search form 
will re-appear, containing your previous search information. If you select 
<guilabel>Edit as Advanced Search</guilabel>, the advanced search tool dialog 
will be come up to modify your previous search information using more elaborate 
search rules. See the <link linkend="using-mainwindow-advancedsearchtool">The 
Advanced Search Tool</link> section for more information.
+                If you select <guilabel>Edit Search</guilabel>, the search 
form will re-appear, containing your previous search information. If you select 
<guilabel>Edit as Advanced Search</guilabel>, the advanced search tool dialog 
will be come up to modify your previous search information using more elaborate 
search rules. See the <link linkend="using-mainwindow-advancedsearchtool">The 
Advanced Search Tool</link> section for more information.
             </para>
 
             <para>
-            If you want to remove an existing search from the list, just 
select <guilabel>Delete Search</guilabel> from the pop-up menu.
+                If you want to remove an existing search from the list, just 
select <guilabel>Delete Search</guilabel> from the pop-up menu.
             </para>
 
             <example>
                 <title>Search View from Main Window</title>
-                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;maininterfacesearchview.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-searchview.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
             </example>
 
         </sect3>
@@ -522,39 +533,44 @@
         <anchor id="advancedsearchtool.anchor"/>
 
             <para>
-            Advanced Search tool provides an extended search form with a 
wealth of search parameters, which can be used to search in specific fields of 
the &digikam; albums database.
+                Advanced Search tool provides an extended search form with a 
wealth of search parameters, which can be used to search in specific fields of 
the &digikam; albums database.
             </para>
 
             <para>
-            The <guilabel>Search Rules</guilabel> list is used to set all 
options to process a search query in the albums database. All rules are listed 
vertically and separated by an operator. An option can be added or deleted to 
the list using <guilabel>Add Search Group/Remove Group</guilabel>. Each option 
can be combined with another one using <guilabel>Meet all..</guilabel> or 
<guilabel>Meet any...</guilabel> or <guilabel>one of these...</guilabel>  
<guilabel>At least one...</guilabel> logical operators. Thus, one can construct 
searches of the type &quot;AND NOT&quot;.
+                The <guilabel>Search Rules</guilabel> list is used to set all 
options to process a search query in the albums database. All rules are listed 
vertically and separated by an operator. An option can be added or deleted to 
the list using <guilabel>Add Search Group/Remove Group</guilabel>. Each option 
can be combined with another one using <guilabel>Meet all..</guilabel> or 
<guilabel>Meet any...</guilabel> or <guilabel>one of these...</guilabel>  
<guilabel>At least one...</guilabel> logical operators. Thus, one can construct 
searches of the type &quot;AND NOT&quot;.
             </para>
 
             </sect3>
 
     </sect2>
 
-    <sect2 id="fuzzy-searches">              <title>Fuzzy 
Searches/Duplicates</title>
-            <para>&digikam; characterizes every image by a legthy number using 
a special technique (Haar algorithm) that make it possible to compare images by 
comparing this calculated signature. The less numerical difference there is 
between any two image signatures, the more they resemble each other. This 
technique has three implementations</para>
-                <itemizedlist>
+    <sect2 id="fuzzy-searches"> <title>Fuzzy Searches/Duplicates</title>
+
+            <para>
+                &digikam; characterizes every image by a legthy number using a 
special technique (Haar algorithm) that make it possible to compare images by 
comparing this calculated signature. The less numerical difference there is 
between any two image signatures, the more they resemble each other. This 
technique has three implementations
+            </para>
+
+            <itemizedlist>
                 <listitem><para>Similar items: This is a drag&amp;drop zone 
where you can drop any image to find a similar one. A threshold can be modified 
in order to narrow down or enlarge the resulting selection. Drag an image from 
anywhere over the fuzzy search icon in the left sidebar, it will open and you 
drop it there.</para></listitem>
                 <listitem><para>Sketch: free hand color sketching: draw a 
quick sketch and &digikam; will find corresponding images. Again a threshold 
can be set.</para></listitem>
                 <listitem><para>Duplicates: after &digikam; has scanned all 
collections you will find a list of duplicates here. It's up to you of course 
to decide what to do with them. From the menu 
<menuchoice><guimenu>Tools</guimenu><guimenuitem>Rebuild all 
fingerprints...</guimenuitem></menuchoice> you can initiate a total rebuild of 
the image signatures (may take hours if you have a large collection, an 
estimate is 2 hours for 10'000 images) or from the bottom you can just rescan, 
which is much faster. <guimenu>Find duplicates</guimenu> will do just that, but 
it will take a long time too as it has to compare every image with any other 
image. Fortunately, you can refine your search by albums and/or 
tags.</para></listitem>
-                </itemizedlist>
+            </itemizedlist>
 
-                <example>
-                    <title>Fuzzy search for similar image</title>
-                    <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;fuzzysearchsimilar.png" format="PNG" 
/></imageobject></mediaobject></screenshot>
-                </example>
-
-                <example>
-                    <title>Find duplicates while restricting to an 
album</title>
-                    <screenshot><mediaobject>
-                    <imageobject><imagedata 
fileref="&path;duplicates_albumsfilter.png" format="PNG" /></imageobject>
-                    </mediaobject></screenshot>
-                </example>
+            <example>
+                <title>Fuzzy search for similar image</title>
+                <screenshot><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-searchsimilar.png" format="PNG" 
/></imageobject></mediaobject></screenshot>
+            </example>
+
+            <example>
+                <title>Find duplicates while restricting to an album</title>
+                <screenshot><mediaobject>
+                <imageobject><imagedata 
fileref="&path;using-mainwindow-duplicates-albumsfilter.png" format="PNG" 
/></imageobject>
+                </mediaobject></screenshot>
+            </example>
     </sect2>
 
-    <sect2>                                  <title>Map Searches</title>
+    <sect2> <title>Map Searches</title>
+
         <para>
             This tab provides an intuitive map search tool based on the marble 
widget. You can zoom in and out with the mousewheel by either scrolling it or 
hold and drag it. Pan by holding down the left mouse button. Press the 
<keycombo action="press">&Ctrl;<keycap>left mouse button</keycap></keycombo> to 
pull-up a square as indicated. All images falling within the coordinates of 
that square will be filtered and shown (provided your images have been 
geo-coded of course).
         </para>
@@ -562,17 +578,17 @@
         <para>
             In the box below you can enter a name for your geo filter. It will 
be added to the list view below for future reference, it acts as a live geo 
folder.
         </para>
-        
+
             <example>   <title>The Map Searches tab</title>
 
-                <screenshot><screeninfo>For higher resolution maps choose 
"More Info"</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;sidebargeolocation.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
+                <screenshot><screeninfo>For higher resolution maps choose 
"More Info"</screeninfo><mediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-mapsearch.png" format="PNG" /> 
</imageobject></mediaobject></screenshot>
 
             </example>
 
     </sect2>
 
 </sect1>
- 
+
 <!--
 Local Variables:
 mode: sgml

Reply via email to