Git commit f0ed28e47af668bcd5da94ea3838cf9dd0f82531 by Yuri Chornoivan.
Committed on 04/09/2016 at 14:09.
Pushed by yurchor into branch 'master'.

Polishing

M  +8    -12   digikam/using-mainwindow.docbook

http://commits.kde.org/digikam-doc/f0ed28e47af668bcd5da94ea3838cf9dd0f82531

diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index 7d603ee..7cb3d20 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -83,7 +83,7 @@
 
                     <listitem><para>Slideshow drop down menu</para></listitem>
 
-                    <listitem><para>Toggle Full Screen 
(Ctrl+Shift+F)</para></listitem>
+                    <listitem><para>Toggle Full Screen 
(&Ctrl;+&Shift;+<keycap>F</keycap>)</para></listitem>
 
                 </orderedlist>
 
@@ -157,21 +157,17 @@
                 There are several possibilities to view an image. You can 
either click on it, select 
                 <menuchoice>
                     <shortcut><keycombo 
action="press"><keycap>F3</keycap></keycombo></shortcut>
-                    
<guimenu>Image</guimenu><guimenuitem>View</guimenuitem><guimenuitem>Preview 
Image</guimenuitem>
+                    
<guimenu>Image</guimenu><guisubmenu>View</guisubmenu><guimenuitem>Preview 
Image</guimenuitem>
                 </menuchoice> 
                 from the menu bar or select <guilabel>View</guilabel> from the 
context menu. The Preview Area will open and the Icon Area will be reduced to 
one line. For viewing it larger, click the sidebars away (by just clicking on 
the active button on them). An even larger view you can achieve by clicking the 
<quote>Show Fullscreen</quote> icon 
                 <inlinemediaobject>
                     <imageobject><imagedata 
fileref="&path;using-mainwindow-icon-fullscreen.png" format="PNG"/> 
</imageobject>
                 </inlinemediaobject> 
                 either on the thumbnail or on the preview. While viewing 
images you can take action from the context menu at any time (not in fullscreen 
mode). To close the preview, just click again or press
-                <menuchoice>
-                    <shortcut><keycombo 
action="press">&Esc;</keycombo></shortcut>
-                    <guimenu></guimenu>
-                </menuchoice> or
-                <menuchoice>
-                    <shortcut><keycombo 
action="press"><keycap>F3</keycap></keycombo></shortcut>
-                    <guimenu></guimenu>
-                </menuchoice> or click the 
+                    &Esc;
+                or
+                    <keycap>F3</keycap>
+                or click the 
                 <menuchoice><guimenu>Table</guimenu></menuchoice> or 
                 <menuchoice><guimenu>Thumbnail</guimenu></menuchoice> button.
             </para>
@@ -300,7 +296,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 
<menuchoice><guimenu>Import</guimenu> 
<guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new 
empty Album with <menuchoice><guimenu>Album</guimenu> 
<guimenuitem>New...</guimenuitem></menuchoice> (Ctrl+N) in the 
<quote>Albums</quote> view. 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 
<menuchoice><guimenu>Import</guimenu> 
<guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new 
empty Album with <menuchoice><guimenu>Album</guimenu> 
<guimenuitem>New...</guimenuitem></menuchoice> (&Ctrl;+<keycap>N</keycap>) in 
the <quote>Albums</quote> view. 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>
@@ -318,7 +314,7 @@
         <title>Adding a Photograph to an Album</title>
 
             <para>
-                Most of the time you will create new Albums and populate them 
with photographs directly from your camera using the Camera Tool. However, 
sometimes you may want to add a photograph that you already have on your 
computer to an existing Album. To add a photograph to an Album select 
<menuchoice><guimenu>Import</guimenu> <guimenuitem>Add 
Images...</guimenuitem></menuchoice> (&Ctrl;+&Alt;+<keycap>I</keycap>) from the 
menu bar. Select a source folder from the dialog and click 
<guibutton>OK</guibutton>. An import window will open. Select the photographs 
that you want to add and choose <guilabel>Download Selected</guilabel> from the 
<quote>Download</quote> drop down menu. A dialog will open where you can choose 
the destination album. The photographs will be copied into the Album. 
<guilabel>Download New</guilabel> (Ctrl+N) from the same menu will copy only 
those images which are not in the destination folder yet.
+                Most of the time you will create new Albums and populate them 
with photographs directly from your camera using the Camera Tool. However, 
sometimes you may want to add a photograph that you already have on your 
computer to an existing Album. To add a photograph to an Album select 
<menuchoice><guimenu>Import</guimenu> <guimenuitem>Add 
Images...</guimenuitem></menuchoice> (&Ctrl;+&Alt;+<keycap>I</keycap>) from the 
menu bar. Select a source folder from the dialog and click 
<guibutton>OK</guibutton>. An import window will open. Select the photographs 
that you want to add and choose <guilabel>Download Selected</guilabel> from the 
<quote>Download</quote> drop down menu. A dialog will open where you can choose 
the destination album. The photographs will be copied into the Album. 
<guilabel>Download New</guilabel> (&Ctrl;+<keycap>N</keycap>) from the same 
menu will copy only those images which are not in the destination folder yet.
             </para>
 
             <para>

Reply via email to