Git commit 315da9d727cadf80d6d807fda96a5589c9ebc944 by Gilles Caulier, on behalf of Wolfgang Scheffner. Committed on 29/12/2016 at 16:23. Pushed by cgilles into branch 'master'.
Apply patch 001 M +3 -3 digikam/menu-mainwindow.docbook M +23 -54 digikam/using-camera-basis.docbook M +6 -6 digikam/using-camera-intro.docbook https://commits.kde.org/digikam-doc/315da9d727cadf80d6d807fda96a5589c9ebc944 diff --git a/digikam/menu-mainwindow.docbook b/digikam/menu-mainwindow.docbook index d37c8a5..b9b2e5d 100644 --- a/digikam/menu-mainwindow.docbook +++ b/digikam/menu-mainwindow.docbook @@ -466,7 +466,7 @@ <listitem> <para> <action> - Shows images in a table where you can choose by right clicking on the title bar which information you want to be displayed. + Shows images in a table where you can choose by right clicking on the title bar which informations you want to be displayed. </action> </para> <para> @@ -543,7 +543,7 @@ <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo> </shortcut> + <shortcut><keycombo action="simul">&Ctrl;<keycap>+,+</keycap></keycombo> </shortcut> <guimenu>View</guimenu><guimenuitem>Zoom in</guimenuitem> </menuchoice></term> <listitem><para><action>Increase preview or the thumbnail size of the currently selected Album.</action></para></listitem> @@ -551,7 +551,7 @@ <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo> </shortcut> + <shortcut><keycombo action="simul">&Ctrl;<keycap>-,-</keycap></keycombo> </shortcut> <guimenu>View</guimenu><guimenuitem>Zoom out</guimenuitem> </menuchoice></term> <listitem><para><action>Decrease preview or the thumbnail size of the currently selected Album.</action></para></listitem> diff --git a/digikam/using-camera-basis.docbook b/digikam/using-camera-basis.docbook index 27b5b1c..8b07741 100644 --- a/digikam/using-camera-basis.docbook +++ b/digikam/using-camera-basis.docbook @@ -1,84 +1,48 @@ <sect2 id="using-camera-basis"> -<title>Basic Camera Interface Operations</title> +<title>Basic Import Interface Operations</title> <sect3 id="using-camera-info"> - <title>Getting information about photographs from the Camera</title> + <title>Getting information about the photographs</title> <para> - Before downloading photographs to your computer, you may wish to see camera item information. Using the <menuchoice><guimenuitem>Properties</guimenuitem></menuchoice> and <menuchoice><guimenuitem>Metadata</guimenuitem></menuchoice> side bar tabs from Camera Interface will launch camera item properties and metadata information. + 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> - <screenshot> - <screeninfo>The camera item properties sidebar Tab</screeninfo> - <mediaobject><imageobject> + <para> + <inlinemediaobject><imageobject> <imagedata fileref="&path;using-camera-itemproperties.png" format="PNG" /> - </imageobject></mediaobject> - </screenshot> + </imageobject></inlinemediaobject> + </para> </example> <para> - The Properties tab displays file information recorded by the camera and a resume of photographer 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, all this information may be unavailable with some digital cameras. </para> <para> - The Metadata tab displays an internal picture's metadata like EXIF, Makernotes, GPS, &etc; This information is the same as <link linkend="using-sidebar-metadata">sidebar Metadata</link> from the &digikam; main interface or image editor. 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, all these metadata can be unavailable with some digital cameras. </para> </sect3> - <sect3 id="using-camera-target"> - <title>Selecting a Target Album</title> - - <anchor id="targetalbumdialog.anchor"/> - - <para> - Using <guilabel>Download All</guilabel> or <guilabel>Download Selected</guilabel> buttons will bring up a dialog, that allows you to select a target Album into which the photographs will be downloaded. The list of existing Albums is displayed, ordered by the Folder method (see the <link linkend="using-mainwindow-albumsview">Albums View</link> for details of Album ordering). You can select the target Album from this list and then click OK. - </para> - - <example> - - <title>The Target Album Selection Dialog</title> - <screenshot> - <screeninfo>The Target Album Selection Dialog</screeninfo> - <mediaobject><imageobject> - <imagedata fileref="&path;using-camera-targetalbumdialog.png" format="PNG" /> - </imageobject></mediaobject> - </screenshot> - - </example> - - <para> - If you want to create a new Album, into which you could download the photographs, click the <guilabel>New Album</guilabel> button. The new Album will be created as a sub-folder of the Album that is currently selected in the existing Album list. This means that, if you do not want your new Album to be a sub-folder of an existing folder, you must first select the "My Albums" entry from the very top of the existing Albums list before creating a new Album. - </para> + <sect3 id="using-camera-geolocation"> + <title>Geolocation Tab</title> <para> - When you have selected the target Album, click OK and &digikam; will download the photographs from the camera to that album. + 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. </para> - - <para> - - <inlinemediaobject> - <imageobject> - <imagedata fileref="&path;using-camera-download.png" format="PNG" /> - </imageobject> - <textobject> - <phrase>The Downloading in Progress</phrase> - </textobject> - </inlinemediaobject> - - </para> - + </sect3> <sect3 id="using-camera-download"> <title>Downloading photographs to your computer</title> <para> - The simplest way to download photographs from your camera to your computer is to click the <guilabel>Download</guilabel> button and then click <guilabel>Download All</guilabel>. This will download all of the photographs on the camera to a single Album in &digikam;. The download process will not remove the photographs from the camera. It is always advisable to check that the photographs have downloaded safely into the Album you were expecting before deleting them from the camera. + To download photographs from your camera to your computer click the <guilabel>Download</guilabel> button on the main toolbar and then click <guilabel>Download All</guilabel> (or use <menuchoice><guimenu>Item</guimenu><guimenuitem>Download All</guimenuitem></menuchoice> from the main menu). This will download all of the photographs on the camera with the settings you used with your last download (Settings tab). The download process will not remove the photographs from the camera. It is always advisable to check that the photographs have downloaded safely into the Album you were expecting before deleting them from the camera. </para> <para> @@ -95,11 +59,16 @@ <title>Uploading Photographs to your camera</title> <para> - The simplest way to upload photographs from your computer to your camera is to click the <guilabel>Download</guilabel> button and then click <guilabel>Upload</guilabel>. 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. + To upload photographs from your computer to your camera click + <menuchoice> + <shortcut><keycombo action="simul">&Ctrl;<keycap>N</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. </para> <para> - When images selection is done, &digikam; will ask you where you want to upload the files on your camera. A camera folder selection dialog will appear. Just select one folder and press OK to start uploading. No images will be removed from your computer. + When images selection is done, &digikam; will ask you to where you want to upload the files on your camera. A camera folder selection dialog will appear. Just select one folder and press OK to start uploading. No images will be removed from your computer. </para> <example> @@ -124,11 +93,11 @@ <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>Delete</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>Delete</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>. </para> <caution><para> - Please note that there is no way to restore a photo that you have deleted from the camera. The photographs are not moved to the internal Trash Can, they are removed completely. It is best to double check that you have successfully downloaded a photograph into a &digikam; Album before you delete it from the camera. Anyway, if you plan to empty the camera card, you better do that from the camera menu because it is much quicker. + Please note that there is no way to restore a photo that you have deleted from the camera. The photographs are not moved to the internal Trash Can, they are removed completely. It is best to double check that you have successfully downloaded a photograph into a &digikam; album before you delete it from the camera. Anyway, if you plan to empty the camera card, you better do that from the camera menu because it is much quicker. </para></caution> </sect3> diff --git a/digikam/using-camera-intro.docbook b/digikam/using-camera-intro.docbook index 03d24c3..816fd89 100644 --- a/digikam/using-camera-intro.docbook +++ b/digikam/using-camera-intro.docbook @@ -59,12 +59,12 @@ </para> <para> - <screenshot> - <screeninfo>The Camera Client Window</screeninfo> - <mediaobject><imageobject> - <imagedata fileref="&path;using-camera-maininterface.png" format="PNG" /> - </imageobject></mediaobject> - </screenshot> + <mediaobject> + <imageobject><imagedata fileref="&path;using-camera-maininterface.png" format="PNG" /> + </imageobject> + </mediaobject> + </para> + <para> </para> </sect2>
