Git commit e3868a46d4e05788a659a4a2ff9dad03a2d74c53 by Gilles Caulier.
Committed on 18/12/2016 at 08:23.
Pushed by cgilles into branch 'master'.

apply patch #21 from Wolfgang

M  +132  -58   digikam/menu-mainwindow.docbook

https://commits.kde.org/digikam-doc/e3868a46d4e05788a659a4a2ff9dad03a2d74c53

diff --git a/digikam/menu-mainwindow.docbook b/digikam/menu-mainwindow.docbook
index cb0c5da..c61ec6e 100644
--- a/digikam/menu-mainwindow.docbook
+++ b/digikam/menu-mainwindow.docbook
@@ -129,47 +129,61 @@
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo 
action="press"><keycap>F3</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>View...</guimenuitem>
-            </menuchoice> or 
-                  <menuchoice>
-                   <shortcut><keycombo 
action="press">&Enter;</keycombo></shortcut>
-                     <guimenu></guimenu></menuchoice></term>
-            <listitem><para><action>View the selected 
image.</action></para></listitem>
+                <shortcut><keycombo 
action="press"><keycap>F4</keycap></keycombo> </shortcut>
+                <guimenu>Item</guimenu><guimenuitem>Open...</guimenuitem>
+            </menuchoice></term>
+            <listitem><para><action>Opens the selected image in the &digikam; 
image editor.</action></para></listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                   <shortcut><keycombo 
action="press"><keycap>Esc</keycap></keycombo></shortcut> 
-                   <guimenu></guimenu></menuchoice> or 
-                  <menuchoice>
-                   <shortcut><keycombo 
action="press"><keycap>F3</keycap></keycombo></shortcut>
-                     <guimenu></guimenu></menuchoice></term>
-            <listitem><para><action>Puts you back from 'image view' into the 
main window.</action></para></listitem>
+                   <shortcut><keycombo 
action="press"><keycap>Meta</keycap><keycap>F4</keycap></keycombo></shortcut> 
+                   <guimenu>Item</guimenu><guimenuitem>Open With Default 
Application</guimenuitem></menuchoice></term>
+            <listitem><para><action>Opens the selected item in the default 
application according to the mimetype, &eg; Gwenview.</action></para></listitem>
+        </varlistentry>
+        
+        <varlistentry>
+            <term>______________________________</term>
+            <listitem><para></para></listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo 
action="press"><keycap>F4</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>Edit...</guimenuitem>
+                <shortcut><keycombo 
action="press"><keycap>F2</keycap></keycombo> </shortcut>
+                <guimenu>Item</guimenu><guimenuitem>Rename</guimenuitem>
+            </menuchoice></term>
+            <listitem><para><action>Renames the currently selected item(s). 
See description 
+                         <link linkend="using-renameimage">here</link>.
+            </action></para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <shortcut><keycombo 
action="press"><keycap>Del</keycap></keycombo> </shortcut>
+                <guimenu>Item</guimenu><guimenuitem>Move to trash</guimenuitem>
             </menuchoice></term>
-            <listitem><para><action>Open the currently selected image in the 
&digikam; image editor.</action></para></listitem>
+            <listitem><para><action>Moves selected item(s) to trash 
(recoverable delete).</action></para></listitem>
+        </varlistentry>
+        
+        <varlistentry>
+            <term>______________________________</term>
+            <listitem><para></para></listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo 
action="press">&Ctrl;<keycap>L</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>Place onto Light 
Table</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Place onto Light 
Table</guimenuitem>
             </menuchoice></term>
             <listitem>
-                <para><action>Inserts selection to the Light Table thumbbar 
and puts the Light Table into the foreground.</action></para>
+                <para><action>Inserts selection into the Light Table thumbbar 
and puts the Light Table into the foreground.</action></para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo 
action="press">&Ctrl;&Shift;<keycap>L</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>Add to Light 
Table</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Add to Light 
Table</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>Adds selection to the Light Table thumbbar and 
puts the Light Table into the foreground.</action></para>
@@ -178,67 +192,144 @@
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Adjust EXIF Orientation 
Tag</guimenuitem>
+                <shortcut><keycombo 
action="press">&Ctrl;<keycap>B</keycap></keycombo> </shortcut>
+                <guimenu>Item</guimenu><guimenuitem>Add to Current 
Queue</guimenuitem>
+            </menuchoice></term>
+            <listitem><para><action>Opens the &digikam; Batch Queue Manager 
and adds selection to the current queue or, if there is no queue yet, to a new 
queue.</action></para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <shortcut><keycombo 
action="press">&Ctrl;&Shift;<keycap>B</keycap></keycombo> </shortcut>
+                <guimenu>Item</guimenu><guimenuitem>Add to New 
Queue</guimenuitem>
+            </menuchoice></term>
+            <listitem><para><action>Opens the &digikam; Batch Queue Manager 
and puts selection into a new queue.</action></para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <guimenu>Item</guimenu><guimenuitem>Find 
Similar...</guimenuitem>
+            </menuchoice></term>
+    <listitem><para><action>Puts the selected item into the 
<guilabel>Image</guilabel> tab in the Fuzzy View.</action></para>
+                <para>
+                    See the dedicated 
+                    <link linkend="find-similar">Image (Similar items)</link> 
+                    for more information.
+                </para>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <guimenu>Item</guimenu><guimenuitem>Write Metadata to 
Image</guimenuitem>
             </menuchoice></term>
-            <listitem><para><action>Manual EXIF Orientation Tag adjustment 
options of the currently selected image.</action></para></listitem>
+            <listitem><para><action>TODO</action></para></listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Auto Rotate/Flip using 
EXIF information</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Reread Metadata from 
Image</guimenuitem>
+            </menuchoice></term>
+            <listitem><para><action>When editing metadata using the Metadata 
Editor the data will be written to the image only. If you want them to appear 
in the Metadata Tab of the Right Sidebar you got to use this function 
first.</action></para></listitem>
+        </varlistentry>
+        
+        <varlistentry>
+            <term>______________________________</term>
+            <listitem><para></para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <guimenu>Item</guimenu><guimenuitem>Rotate</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Menu entry to manually activate the auto rotate/flip 
feature for the currently selected images using the EXIF orientation tag.
+                    Menu entry for rotating the currently selected images 
lossless 
+                    <menuchoice>
+                        <shortcut><keycombo 
action="press">&Ctrl;&Shift;&Left;</keycombo></shortcut>
+                        <guimenu>Left</guimenu>
+                    </menuchoice> 
+                    or 
+                    <menuchoice>
+                        <shortcut><keycombo 
action="press">&Ctrl;&Shift;&Right;</keycombo></shortcut>
+                        <guimenu>Right</guimenu>
+                    </menuchoice> 
+                    in 90 degree steps (see submenu).
                 </action></para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Rotate</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Flip</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Menu entry for rotating the currently selected images by 
90/180/270 degrees.
+                    Menu entry for flipping the currently selected images 
lossless 
+                    <menuchoice>
+                        <shortcut><keycombo 
action="press">&Ctrl;<keycap>*</keycap></keycombo></shortcut>
+                        <guimenu>Horizontally</guimenu>
+                    </menuchoice>  
+                    or 
+                    <menuchoice>
+                        <shortcut><keycombo 
action="press">&Ctrl;<keycap>/</keycap></keycombo></shortcut>
+                        <guimenu>Vertically</guimenu>
+                    </menuchoice> 
+                    (see submenu).
                 </action></para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Flip</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Auto Rotate/Flip using 
EXIF information</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Menu entry for flipping the currently selected images 
horizontally or vertically.
+                    Menu entry to manually activate the auto rotate/flip 
feature for the currently selected images using the EXIF orientation tag. For a 
more detailed description see 
+                    <link linkend="using-rotateimage">Lossless Image 
Rotation</link>.
                 </action></para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Email 
Images...</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Adjust EXIF Orientation 
Tag</guimenuitem>
+            </menuchoice></term>
+    <listitem><para><action>The EXIF Orientation Tag of the current selection 
will be changed depending on the option you choose from the submenu. The 
thumbnail(s) and preview(s) will be rotated accordingly if <guilabel>Show 
images/thumbnails rotated according to orientation tag</guilabel> is checked in 
+                <menuchoice>
+                    <guimenu>Settings</guimenu><guisubmenu>Configure 
&digikam;...</guisubmenu><guisubmenu>Metadata</guisubmenu><guisubmenu>Rotation</guisubmenu><guimenuitem>Rotate
 actions</guimenuitem>
+                </menuchoice>
+                , but not the actual image file. If you want to rotate that as 
well you got to use the function 
+                <menuchoice>
+                    <guimenu>Item</guimenu><guimenuitem>Auto Rotate/Flip using 
EXIF information</guimenuitem>
+                </menuchoice> 
+                descibed above additionally. If you open the file in the 
&digikam; Image Editor it will also come up in the rotated version and will be 
stored that way on disc if you save it. But be aware of the fact that this 
would be a lossy operation as long as it is not a lossless file 
format.</action></para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term><menuchoice>
+                <guimenu>Item</guimenu><guimenuitem>Edit 
Metadata...</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Tool to e-mail images with your preferred mail agent.
+                    Opens the &digikam; Metadata Editor to handle meta data of 
the image (EXIF, IPTC, XMP).
                 </action></para>
                 <para>
                     See the dedicated 
-                    <link linkend="tool-sendimages">Send Images Tool</link>
-                    for more information.
+                    <link linkend="tool-metadataeditor">Metadata Editor</link> 
+                    chapter for more information.
                 </para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Geolocation</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Edit 
Geolocation...</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Tool to handle GPS meta data of the image.
+                    Opens the &digikam; Geolocation Editor to handle GPS meta 
data of the image.
                 </action></para>
                 <para>
                     See the dedicated 
@@ -247,27 +338,26 @@
                 </para>     
             </listitem>
         </varlistentry>
+        
+        <varlistentry>
+            <term>______________________________</term>
+            <listitem><para></para></listitem>
+        </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Metadata</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Print</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
-                    Tool to handle meta data of the image (EXIF, IPTC, XMP).
+                    Calls standard print dialog.
                 </action></para>
-                <para>
-                    See the dedicated 
-                    <link linkend="tool-metadataeditor">Metadata Editor</link> 
-                    for more information.
-                </para>
             </listitem>
         </varlistentry>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Image</guimenu><guimenuitem>Print 
-                Assistant...</guimenuitem>
+                <guimenu>Item</guimenu><guimenuitem>Print 
Assistant...</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
@@ -281,22 +371,6 @@
             </listitem>
         </varlistentry>
 
-        <varlistentry>
-            <term><menuchoice>
-                <shortcut><keycombo 
action="press"><keycap>F2</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>Rename</guimenuitem>
-            </menuchoice></term>
-            <listitem><para><action>Rename the currently selected 
image.</action></para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term><menuchoice>
-                <shortcut><keycombo 
action="press"><keycap>F8</keycap></keycombo> </shortcut>
-                <guimenu>Image</guimenu><guimenuitem>Delete</guimenuitem>
-            </menuchoice></term>
-            <listitem><para><action>Move to trash (recoverable 
delete)</action></para></listitem>
-        </varlistentry>
-
     </variablelist>
     </para>
 

Reply via email to