Git commit 2c273ecba02a16d9f659d2501d12b84f79a5b956 by Gilles Caulier.
Committed on 16/09/2016 at 15:11.
Pushed by cgilles into branch 'master'.

apply new patch from Wolfgang about Using MainWindow chapter

D  +-    --    digikam/using-mainwindow-iconview.png
M  +-    --    digikam/using-mainwindow-preview.png
M  +54   -41   digikam/using-mainwindow.docbook

http://commits.kde.org/digikam-doc/2c273ecba02a16d9f659d2501d12b84f79a5b956

diff --git a/digikam/using-mainwindow-iconview.png 
b/digikam/using-mainwindow-iconview.png
deleted file mode 100644
index 7057e1d..0000000
Binary files a/digikam/using-mainwindow-iconview.png and /dev/null differ
diff --git a/digikam/using-mainwindow-preview.png 
b/digikam/using-mainwindow-preview.png
index 1ad4015..b04e6e7 100644
Binary files a/digikam/using-mainwindow-preview.png and 
b/digikam/using-mainwindow-preview.png differ
diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index dec7a8b..d4b03d9 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -5,8 +5,9 @@
         <title>Introduction to the Main Window</title>
 
     <para>
-        <inlinemediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-iconview.png" format="PNG" /> </imageobject>
-        </inlinemediaobject>
+        <mediaobject>
+            <imageobject><imagedata 
fileref="&path;using-mainwindow-preview.png" format="PNG" /></imageobject>
+        </mediaobject>
     </para>
 
         <sect3 id="using-areasandbars">
@@ -57,10 +58,9 @@
             </para>
 
             <para>
-                <inlinemediaobject>
+                <mediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-toolbar.png" format="PNG"/></imageobject>
-                    <textobject> <phrase>The Default Main Toolbar</phrase> 
</textobject>
-                </inlinemediaobject>
+                </mediaobject>
             </para>
 
             <para>
@@ -104,10 +104,9 @@
 
             <para>
                 In all eight views the Image Area shows the result of your 
selection or search on the Left Sidebar in the Icon Area. Each image is 
displayed as a thumbnail. You can alter the size of the thumbnails using the 
magnifier slider close to the right end of the status bar.
-                <inlinemediaobject>
+                <mediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-zoombuttons.png" format="PNG"/></imageobject>
-                    <textobject> <phrase>The thumbnail size slider</phrase> 
</textobject>
-                </inlinemediaobject>
+                </mediaobject>
             </para>
 
             <para>
@@ -176,10 +175,9 @@
             </para>
 
             <para>
-                <inlinemediaobject>
+                <mediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-preview.png" format="PNG"/></imageobject>
-                    <textobject> <phrase>The viewer with thumbnail slider 
below</phrase> </textobject>
-                </inlinemediaobject>
+                </mediaobject>
             </para>
 
             <para>
@@ -279,8 +277,9 @@
     <title>Albums View</title>
 
         <para>
-            <inlinemediaobject><imageobject><imagedata 
fileref="&path;using-mainwindow-albumview.png" format="PNG" /> </imageobject>
-            </inlinemediaobject>
+            <mediaobject>
+                <imageobject><imagedata 
fileref="&path;using-mainwindow-albumview.png" format="PNG" /> </imageobject>
+            </mediaobject>
         </para>
 
         <para>
@@ -413,9 +412,9 @@
         <para></para>
         
         <para>
-            <inlinemediaobject>
+            <mediaobject>
                 <imageobject><imagedata 
fileref="&path;using-mainwindow-tagsview.png" format="PNG" /></imageobject>
-            </inlinemediaobject>
+            </mediaobject>
         </para>
 
         <para>
@@ -552,9 +551,9 @@
         </para>
 
         <para>
-            <inlinemediaobject>
+            <mediaobject>
                 <imageobject><imagedata 
fileref="&path;using-mainwindow-labelsview.png" format="PNG" /></imageobject>
-            </inlinemediaobject>
+            </mediaobject>
         </para>
 
         <para>
@@ -567,14 +566,13 @@
     <sect2 id="using-mydatesview"><title>Dates View</title>
 
         <para>
-            <inlinemediaobject>
+            <mediaobject>
                 <imageobject><imagedata 
fileref="&path;using-mainwindow-dateview.png" format="PNG" /></imageobject>
-                <textobject><phrase>Dates View from Main 
Window</phrase></textobject>
-            </inlinemediaobject>
+            </mediaobject>
         </para>
 
         <para>
-            The <quote>Dates</quote> view organizes your photographs based on 
their dates. &digikam; uses either the
+            The Dates View organizes your photographs based on their dates. 
&digikam; uses either the
             EXIF date or, if no EXIF date is available, the last modification 
time of the file.
         </para>
 
@@ -592,9 +590,9 @@
         </para>
 
         <para>
-            <inlinemediaobject>
+            <mediaobject>
                 <imageobject><imagedata 
fileref="&path;using-mainwindow-timeline.png" format="PNG" /></imageobject>
-            </inlinemediaobject>
+            </mediaobject>
         </para>
 
         <para>
@@ -609,16 +607,16 @@
         </para>
         
         <para>
-            <inlinemediaobject>
+            <mediaobject>
                 <imageobject><imagedata 
fileref="&path;using-mainwindow-searchview.png" format="PNG" /> </imageobject>
-            </inlinemediaobject>
+            </mediaobject>
         </para>
 
         <sect3> <title>The Quick Search</title>
         <anchor id="quicksearchtool.anchor"/>
 
             <para>
-                Quick Search is the adaptive search box at the top of the 
search dialog (Left Sidebar) and provides you with a simple means to search the 
&digikam; database 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 the adaptive search box at the top of the 
search dialog (Left Sidebar) and provides you with a simple means to search the 
&digikam; database 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 database for occurrences of the word 'birthday' in all metadata text 
fields, or '05.png' to search for a specific image file name '05.png' (no 
escaping as in regexpressions needed).
             </para>
 
             <para>Search Properties:
@@ -648,9 +646,9 @@
             </para>
                     
             <para>
-                <inlinemediaobject>
+                <mediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-advancedsearchtool.png" format="PNG" /> 
</imageobject>
-                </inlinemediaobject>
+                </mediaobject>
             </para>
 
             <para>
@@ -674,10 +672,21 @@
             
             <para>
                 <itemizedlist>
-                    <listitem><para><quote>Meet All of the following 
conditions</quote> means that your different search parameters will be 
connected by boolean AND for the search. Example: if you selected Album name 
<quote>Holidays</quote> and color <quote>red</quote> the search will find all 
pictures labeled with <quote>red</quote> out of the Album 
<quote>Holidays</quote>.</para></listitem>
-                    <listitem><para><quote>Meet Any of the following 
conditions</quote> means that your different search parameters will be 
connected by boolean OR for the search. Example: if you selected Album name 
<quote>Holidays</quote> and color <quote>red</quote> the search will find all 
pictures labeled with <quote>red</quote> out of your whole collection 
<emphasis>and</emphasis> the content of the Album 
<quote>Holidays</quote>.</para></listitem>
-                    <listitem><para><quote>None of these conditions are 
met</quote> means that your different search parameters will be connected by 
boolean NAND for the search. Again our example: if you selected Album name 
<quote>Holidays</quote> and color <quote>red</quote> the search will find all 
pictures of your collection except those labeled with <quote>red</quote> 
<emphasis>and</emphasis> except those out of the Album 
<quote>Holidays</quote>.</para></listitem>
-                    <listitem><para><quote>At least one of these conditions is 
not met</quote> means that your different search parameters will be connected 
by boolean NOR for the search. One more example: if you selected Album name 
<quote>Holidays</quote> and color <quote>red</quote> the search will find all 
pictures of your collection except those labeled with <quote>red</quote> out of 
the Album <quote>Holidays</quote>.</para></listitem>
+                    <listitem><para>
+                        <quote>Meet All of the following conditions</quote> 
means that your different search parameters will be connected by boolean AND 
for the search. Example: if you selected Album name <quote>Holidays</quote> and 
color <quote>red</quote> the search will find all pictures labeled with 
<quote>red</quote> out of the Album <quote>Holidays</quote>.
+                    </para></listitem>
+
+                    <listitem><para>
+                        <quote>Meet Any of the following conditions</quote> 
means that your different search parameters will be connected by boolean OR for 
the search. Example: if you selected Album name <quote>Holidays</quote> and 
color <quote>red</quote> the search will find the content of the Album 
<quote>Holidays</quote> <emphasis>and</emphasis> all pictures labeled with 
<quote>red</quote> out of your whole collection.
+                    </para></listitem>
+
+                    <listitem><para>
+                        <quote>None of these conditions are met</quote> means 
that your different search parameters will be connected by boolean NAND for the 
search. Again our example: if you selected Album name <quote>Holidays</quote> 
and color <quote>red</quote> the search will find all pictures of your 
collection except those labeled with <quote>red</quote> 
<emphasis>and</emphasis> except those out of the Album <quote>Holidays</quote>.
+                    </para></listitem>
+
+                    <listitem><para>
+                        <quote>At least one of these conditions is not 
met</quote> means that your different search parameters will be connected by 
boolean NOR for the search. One more example: if you selected Album name 
<quote>Holidays</quote> and color <quote>red</quote> the search will find all 
pictures of your collection except those labeled with <quote>red</quote> out of 
the Album <quote>Holidays</quote>.
+                    </para></listitem>
                 </itemizedlist>
             </para>
             
@@ -686,7 +695,7 @@
             </para>
             
             <para>
-                To explain how it works let's make another example based on 
one of those we had already. I want to use the second one. That means: in the 
first group you checked <quote>Meet Any of the following conditions</quote> and 
you selected Album name <quote>Holidays</quote> and color <quote>red</quote>. 
As we said already this will produce all pictures labeled with 
<quote>red</quote> out of your whole collection <emphasis>and</emphasis> the 
content of the Album <quote>Holidays</quote>. Now let's assume for some reason 
you want to exclude all rejected files and all files with a rating lower than 
three stars. So you open a second group, click on the underlined OR in the 
header in order to change it to AND, select <quote>None of these conditions are 
met</quote>, fold out the <quote>Picture Properties</quote>, select under 
<quote>Rating</quote> no star (five white stars) in the first field and two 
stars in the second field. Note that there is a difference between <quote>no 
star</quote> and <quote>No Rating assigned</quote>! If you want to exclude the 
pictures without any rating as well you got to open another Search Group, click 
on the underlined OR in the header in order to change it to AND, select 
<quote>None of these conditions are met</quote> and select <quote>No Rating 
assigned</quote> in the <quote>Picture Properties</quote> category.
+                To explain how it works let's make another example based on 
one of those we had already. I want to use the second one. That means: in the 
first group you checked <quote>Meet Any of the following conditions</quote> and 
you selected Album name <quote>Holidays</quote> and color <quote>red</quote>. 
As we said already this will produce all pictures labeled with 
<quote>red</quote> out of your whole collection <emphasis>and</emphasis> the 
content of the Album <quote>Holidays</quote>. Now let's assume for some reason 
you want to exclude all rejected files and all files with a rating lower than 
three stars. So you open a second group, click on the underlined OR in the 
header in order to change it to AND, select <quote>None of these conditions are 
met</quote>, fold out the <quote>Picture Properties</quote>, check under 
<quote>Labels</quote> the red flag (rejected) and select under 
<quote>Rating</quote> no star (five white stars) in the first field and two 
stars in the second field. Note that there is a difference between <quote>no 
star</quote> and <quote>No Rating assigned</quote>! If you want to exclude the 
pictures without any rating as well you got to open another Search Group, click 
on the underlined OR in the header in order to change it to AND, select 
<quote>None of these conditions are met</quote> and select <quote>No Rating 
assigned</quote> in the <quote>Picture Properties</quote> category.
             </para>
             
             <para>
@@ -770,20 +779,20 @@
             </para>
             
             <para>
-                The first one you would choose if you didn't scan yet or if 
you did with a satisfying result but added new photographs since then. The 
second you would choose if you already improved a search result, &eg; by 
removing face tags which obviously don't show a face. The third is more 
interesting in the context of Face Regognition since <quote>unconfirmed 
results</quote> means face tags that don't have a name assigned to them yet.
+                The first one you would choose if you didn't scan yet or if 
you did with a satisfying result but added new photographs since then or if you 
already improved a search result, &eg; by removing face tags which obviously 
don't show a face. The second you would choose if you want the images already 
scanned to be included in the next scan. The third is more interesting in the 
context of Face Regognition since <quote>unconfirmed results</quote> means face 
tags that don't have a name assigned to them yet.
             </para>
             
             <para>
-                For the task we are talking about you check <guilabel>Detect 
faces</guilabel>, of course. Since face detection is a time-consuming task you 
better <emphasis>don't</emphasis> hit <guilabel>Scan</guilabel> right away, 
rather <guilabel>Options</guilabel>. An additional area will fold out organized 
with three tabs. In <guilabel>Albums</guilabel> you can confine the scan to 
certain albums and/or tags. In <guilabel>Parameters</guilabel> you can try to 
find a balance between speed and accuracy that suits your needs. Under 
<guilabel>Advanced</guilabel> you will find for checkboxes. The first is 
explained by the text above it. The second is for face recognition, see next 
article.
+                For the task we are talking about you check <guilabel>Detect 
faces</guilabel>, of course. Since face detection is a time-consuming task you 
better <emphasis>don't</emphasis> hit <guilabel>Scan</guilabel> right away, 
rather <guilabel>Options</guilabel>. An additional area will fold out organized 
with three tabs. In <guilabel>Albums</guilabel> you can confine the scan to 
certain albums and/or tags. In <guilabel>Parameters</guilabel> you can try to 
find a balance between speed and accuracy that suits your needs. Under 
<guilabel>Advanced</guilabel> you will find four checkboxes. The first is 
explained by the text above it. The second is for face recognition, see next 
article.
             </para>
-            
+
             <para>
                 Once you have choosen your options carefully you click 
<guilabel>Scan</guilabel> and after a while, depending on the scope of your 
selection, the result will be presented in the Image Area. In the Tags list of 
the Left Sidebar you will see the People branch of your tag tree. You will see 
the whole scan result only if the topmost tag <quote>People</quote> is 
selected. In the tree you will see a new virtual tag called 
<quote>Unknown</quote> which will show all those images where faces are 
recognized but not yet connected to a person. If you just scanned for the first 
time you will find the whole result also here.
             </para>
             
             <para>
                 <example>
-                    <title>Face Recognition result</title>
+                    <title>Face Detection result</title>
                     <mediaobject>
                         <imageobject><imagedata 
fileref="&path;using-mainwindow-facedetection.png" format="PNG" /></imageobject>
                     </mediaobject>
@@ -791,10 +800,10 @@
             </para>
             
             <para>
-                Note that the thumbnails presented here are not showing the 
whole image. They show the area of the image where the scan algorithm put down 
a <firstterm>Face Tag</firstterm>. You can see that if you click on the 
thumbnail. In the preview that opens then you will see the whole image with all 
the face tags on them. If you don't see them, click the <mediaobject>
+                Note that the thumbnails presented here are not showing the 
whole image. They show the area of the image where the scan algorithm put down 
a <firstterm>Face Tag</firstterm>. You can see that if you click on the 
thumbnail. In the preview that opens then you will see the whole image with all 
the face tags on them. If you don't see them, click the <inlinemediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-icon-showfacetags.png" format="PNG" 
/></imageobject>
-                </mediaobject> 
-                in the upper left corner of the preview. If there is more than 
one face tag on the image it will also be represented by more than one 
thumbnail. In the screenshot above this is the case with the two topmost 
thumbnails.
+                </inlinemediaobject> 
+                button in the upper left corner of the preview. If there is 
more than one face tag on the image it will also be represented by more than 
one thumbnail. In the screenshot above this is the case with the two topmost 
thumbnails.
             </para>
 
             <para>
@@ -821,7 +830,11 @@
 
             <para>
                 Assigning People tags to face tags is an important 
prerequisite to Face Recognition. Very obviously &digikam; can only recognize 
faces if it has something to compare with. So it's up to you to show it the 
ropes. 
-                
+            </para>
+            
+            <para> TODO </para>
+
+            <para>
                 If a face tag is confirmed and thus showing only the name of 
the tag but not the buttons to remove, edit or confirm it, but you need this 
buttons because &eg; it's wrong and you want to edit or remove it, just 
double-click on the name and the buttons will re-appear.
             </para>
 

Reply via email to