Git commit 6db37a572899bc5c6bba20ac52c80dd587ecd32a by Gilles Caulier, on behalf of Wolfgang Scheffner. Committed on 29/12/2016 at 16:24. Pushed by cgilles into branch 'master'.
applied patch 002 M +18 -20 digikam/using-camera-basis.docbook M +4 -8 digikam/using-camera-intro.docbook M +4 -0 digikam/using-camera.docbook https://commits.kde.org/digikam-doc/6db37a572899bc5c6bba20ac52c80dd587ecd32a diff --git a/digikam/using-camera-basis.docbook b/digikam/using-camera-basis.docbook index 8b07741..10e0d47 100644 --- a/digikam/using-camera-basis.docbook +++ b/digikam/using-camera-basis.docbook @@ -8,23 +8,21 @@ Before downloading photographs to your computer, you may wish to see the camera item information. Using the <guilabel>Properties</guilabel> and <guilabel>Metadata</guilabel> tabs on the Right Sidebar will launch camera and photograph properties and metadata information. </para> - <example> - - <title>The Camera Item Properties Sidebar Tab</title> - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-camera-itemproperties.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - </example> + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="&path;using-camera-itemproperties.png" format="PNG" /> + </imageobject> + </inlinemediaobject> + </para> + + <para>The Item Properties Sidebar Tab</para> <para> - The Properties tab displays file information recorded by the camera and a selection of photograph information to describe how the image has been taken. A flag indicates if the image has not yet been downloaded to the computer. Note, all this information may be unavailable with some digital cameras. + The Properties tab displays file information recorded by the camera and a selection of photograph information to describe how the image has been taken. A flag indicates if the image has not yet been downloaded to the computer. Note that all this information may be unavailable with some digital cameras. </para> <para> - The Metadata tab displays internal picture's metadata like EXIF, Makernotes, GPS, &etc; This information is the same as <link linkend="using-sidebar-metadata">Metadata</link> from the &digikam; Right Sidebar. Note, all these metadata can be unavailable with some digital cameras. + The Metadata tab displays internal picture's metadata like EXIF, Makernotes, GPS, &etc; This information is the same as <link linkend="using-sidebar-metadata">Metadata</link> from the &digikam; Right Sidebar. Note that all these metadata can be unavailable with some digital cameras. </para> </sect3> @@ -33,7 +31,7 @@ <title>Geolocation Tab</title> <para> - The <guilabel>Geolocation</guilabel> tab will a map that allows you to see and edit the GPS location of the selected photographs. For a detailed description see the <link linkend="using-sidebar-maps">Geolocation</link> section of the Right Sidebar chapter of this handbook. + The <guilabel>Geolocation</guilabel> tab will open a map that allows you to see and edit the GPS location of the selected photographs. For a detailed description see the <link linkend="using-sidebar-maps">Geolocation</link> section of the Right Sidebar chapter of this handbook. </para> </sect3> @@ -49,9 +47,9 @@ If you do not want to download all of the photographs you can select just those that you need using the standard selection methods. Once you have the photographs selected, click <guilabel>Download</guilabel> and then <guilabel>Download Selected</guilabel>. The <guilabel>Download Selected</guilabel> button will be grayed out until you have selected some photographs. </para> - <note><para> - If supported by your camera an option <guilabel>Download new</guilabel> is available. Those are images not yet downloaded by &digikam;. In that case the new images are already marked with a star in the thumbnail window. Obviously if you choose this handy option, it will download the new images only. - </para></note> + <para> + Another option is <guilabel>Download new</guilabel>. New images are marked with a star in the upper right corner of the image icon. Once images are downloaded a "downloaded already" entry will be made in the &digikam; database and they are marked with a checker. Obviously, if you choose this handy option, it will download the new images only. + </para> </sect3> @@ -61,10 +59,10 @@ <para> To upload photographs from your computer to your camera click <menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut> + <shortcut><keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></shortcut> <guimenu>Item</guimenu><guimenuitem>Upload...</guimenuitem> - </menuchoice>. - A standard file selection dialog will appear to select the files from your computer to copying on your camera. You can select more than one file using the standard selection methods. + </menuchoice> + in the Import Interface menu. A standard file selection dialog will appear to select the files from your computer for copying to your camera. You can select more than one file using the standard selection methods. </para> <para> @@ -93,7 +91,7 @@ <title>Deleting photographs from the camera</title> <para> - Once you are happy with the downloaded photographs that you wanted, you are ready to delete photographs from the Camera. You can delete all of the photographs at once by clicking the <menuchoice><guimenu>Item</guimenu><guimenuitem>Delete All</guimenuitem></menuchoice> button. If you just want to delete a selection of the photographs, you have to select those that you want to delete and click <menuchoice><guimenu>Item</guimenu><guimenuitem>Delete Selected</guimenuitem></menuchoice>. + Once you are happy with the downloaded photographs that you wanted, you are ready to delete photographs from the Camera. You can delete all of the photographs at once by clicking the <menuchoice><guimenu>Item</guimenu><guimenuitem>Delete All</guimenuitem></menuchoice> button. If you just want to delete a selection of the photographs, you have to select those that you want to delete and click <menuchoice><guimenu>Item</guimenu><guimenuitem>Delete Selected</guimenuitem></menuchoice>. You may also select <menuchoice><guimenu>Item</guimenu><guimenuitem>Delete New</guimenuitem></menuchoice>, for example if you feel that the images marked with the star are not worth downloading. </para> <caution><para> diff --git a/digikam/using-camera-intro.docbook b/digikam/using-camera-intro.docbook index 816fd89..c8cae2e 100644 --- a/digikam/using-camera-intro.docbook +++ b/digikam/using-camera-intro.docbook @@ -47,7 +47,7 @@ </menuchoice></term> <listitem> <para><action> - Select a source folder from the following dialog. + Select a source folder from the dialog that opens. </action></para> </listitem> </varlistentry> @@ -55,18 +55,14 @@ </para> <para> - To be able to use your digital camera with &digikam;, connect the camera to your computer, switch the camera to the image display mode and turn it on. See your camera's user manual if you need more information. - </para> - - <para> - <mediaobject> + <inlinemediaobject> <imageobject><imagedata fileref="&path;using-camera-maininterface.png" format="PNG" /> </imageobject> - </mediaobject> + </inlinemediaobject> </para> <para> </para> - + </sect2> <!-- diff --git a/digikam/using-camera.docbook b/digikam/using-camera.docbook index 4d7ce7d..de358c1 100644 --- a/digikam/using-camera.docbook +++ b/digikam/using-camera.docbook @@ -1,6 +1,10 @@ <sect1 id="using-camera"> <title>Using a Digital Camera With &digikam;</title> <anchor id="camerainterface.anchor"/> + <para> + To be able to use your digital camera with &digikam;, connect the camera to your computer, switch the camera to the image display mode and turn it on. See your camera's user manual if you need more information. + </para> + &doc-using-camera-intro; &doc-using-camera-basis; &doc-using-camera-processing;
