Git commit 5844e20947e2c642926d06d586bb29cf2fa9a66a by Gilles Caulier. Committed on 27/12/2016 at 21:41. Pushed by cgilles into branch 'master'.
apply patch #24 from Wolfgang A +- -- digikam/menu-componentsinfo.png A +- -- digikam/menu-databasestatistics.png M +397 -102 digikam/menu-mainwindow.docbook M +- -- digikam/menu-rawcamerasupport.png M +54 -16 digikam/using-camera-intro.docbook M +- -- digikam/using-camera-maininterface.png https://commits.kde.org/digikam-doc/5844e20947e2c642926d06d586bb29cf2fa9a66a diff --git a/digikam/menu-componentsinfo.png b/digikam/menu-componentsinfo.png new file mode 100644 index 0000000..00a7430 Binary files /dev/null and b/digikam/menu-componentsinfo.png differ diff --git a/digikam/menu-databasestatistics.png b/digikam/menu-databasestatistics.png new file mode 100644 index 0000000..2098317 Binary files /dev/null and b/digikam/menu-databasestatistics.png differ diff --git a/digikam/menu-mainwindow.docbook b/digikam/menu-mainwindow.docbook index 2eaadab..b9b2e5d 100644 --- a/digikam/menu-mainwindow.docbook +++ b/digikam/menu-mainwindow.docbook @@ -1,31 +1,26 @@ <sect1 id="menu-mainwindow"> <title>The main &digikam; window</title> - <sect2> <title>The Album Menu</title> + <sect2> <title>The Browse Menu</title> <para> - <variablelist> + The Browse menu provides access to the same views you can see on the Left Sidebar. Descriptions see under <link linkend="using-mainwindow">The Main &digikam; Window</link>. In addition there are "Back" and "Forward" menu items that will lead you through the history of your &digikam; use in the same way you are used to from an internet browser for example. And finally there is the "Quit" item to leave &digikam;. + </para> - <varlistentry> - <term><menuchoice> - <shortcut><keycombo action="simul">&Alt;<keycap>Left</keycap></keycombo> </shortcut> - <guimenu>Album</guimenu><guimenuitem>Back</guimenuitem> - </menuchoice></term> - <listitem><para><action>Go back to the previously visited View using history.</action></para></listitem> - </varlistentry> + </sect2> - <varlistentry> - <term><menuchoice> - <shortcut><keycombo action="simul">&Alt;<keycap>Right</keycap></keycombo> </shortcut> - <guimenu>Album</guimenu><guimenuitem>Forward</guimenuitem> - </menuchoice></term> - <listitem><para><action>Go forward to the previously visited View using history. You can only go forward if you've just gone back.</action></para></listitem> - </varlistentry> + <!-- *********************************************************************** --> + + <sect2> <title>The Album Menu</title> + + <para> + The first five items of this menu (above the separator) are only active if you are in the Albums View. + <variablelist> <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> </shortcut> <guimenu>Album</guimenu><guimenuitem>New...</guimenuitem> </menuchoice></term> - <listitem><para><action>Create a new album folder.</action></para></listitem> + <listitem><para><action>Opens a dialog to create a new album folder similar to the album properties dialog described <link linkend="albumpropsedit.anchor">here</link>. It just has an additional drop down field where you can choose whether the new album is created as a child of the current one or at the root of the current collection.</action></para></listitem> </varlistentry> <!-- <varlistentry> @@ -39,47 +34,52 @@ <term><menuchoice> <guimenu>Album</guimenu><guimenuitem>Properties</guimenuitem> </menuchoice></term> - <listitem><para><action>Edit the currently selected album title, caption and collection.</action></para></listitem> + <listitem><para><action>Edit the currently selected album title, caption and collection as described <link linkend="albumpropsedit.anchor">here</link>.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul"><keycap>F5</keycap></keycombo> </shortcut> - <guimenu>Album</guimenu><guimenuitem>Refresh</guimenuitem> + <guimenu>Album</guimenu><guimenuitem>Rename</guimenuitem> </menuchoice></term> - <listitem><para><action>Refresh the current view in the Main Window.</action></para></listitem> + <listitem><para><action>Rename the current album.</action></para></listitem> </varlistentry> - <varlistentry id="synchronize-metadata"> + <varlistentry> <term><menuchoice> <guimenu>Album</guimenu> - <guimenuitem>Synchronize Images with Database</guimenuitem> + <guimenuitem>Open in File Manager</guimenuitem> </menuchoice></term> - <listitem><para><action>Synchronize the metadata between database and the file's metadata of all items of the current Main Window. The images will inherit the database metadata, not the other way around as in <link linkend="update-db-metadata">this </link>menu.</action></para></listitem> + <listitem><para><action>Open the default file manager with the current Album path.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Album</guimenu> - <guimenuitem>Open in File Manager</guimenuitem> + <guimenuitem>Delete Album</guimenuitem> </menuchoice></term> - <listitem><para><action>Open the default file manager with the current Album path.</action></para></listitem> + <listitem><para><action>Delete/Move to trash selected Album and all items in it.</action></para></listitem> </varlistentry> - + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry id="synchronize-metadata"> <term><menuchoice> <guimenu>Album</guimenu> - <guimenuitem>Delete</guimenuitem> + <guimenuitem>Write Metadata to Images</guimenuitem> </menuchoice></term> - <listitem><para><action>Delete/Move to trash selected Album and all items in it.</action></para></listitem> + <listitem><para><action>Write the metadata in the database to the file's metadata of all items in the current album. The images will inherit the database metadata, not the other way round as in the next menu item.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> - <guimenu>Album</guimenu><guimenuitem>Quit</guimenuitem> + <guimenu>Album</guimenu> + <guimenuitem>Reread Metadata From Images</guimenuitem> </menuchoice></term> - <listitem><para><action>Quit &digikam;</action></para></listitem> + <listitem><para><action>Write the metadata of all items in the current album to the database. The database will inherit the images metadata, not the other way round as in the previous menu item.</action></para></listitem> </varlistentry> </variablelist> @@ -92,27 +92,40 @@ <sect2> <title>The Tag Menu</title> <para> + The items below the separator are only active if you are in the Tags View. <variablelist> <varlistentry> <term><menuchoice> - <guimenu>Tag</guimenu><guimenuitem>New..</guimenuitem> + <guimenu>Tag</guimenu><guimenuitem>Tag Manager</guimenuitem> + </menuchoice></term> + <listitem><para><action>Opens the <link linkend="using-tagsmngr">&digikam; Tag Manager</link>.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Tag</guimenu><guimenuitem>New...</guimenuitem> </menuchoice></term> - <listitem><para><action>Create a new Tag entry in the Albums Database.</action></para></listitem> + <listitem><para><action>A dialog will open where you can type in the tag name (or even a whole hierarchy branch), assign an icon and/or a shortcut to the tag. The new tag will be created as a sub-tag of the selected tag.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Tag</guimenu><guimenuitem>Properties</guimenuitem> </menuchoice></term> - <listitem><para><action>Edit the properties of the currently selected Tag.</action></para></listitem> + <listitem><para><action>The Tag Properties allow you to change the name of the tag, the icon used in the Tags tree and the shortcut.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Tag</guimenu><guimenuitem>Delete</guimenuitem> </menuchoice></term> - <listitem><para><action>Remove the currently selected Tag from the Album's Database.</action></para></listitem> + <listitem><para><action>Remove the currently selected Tag from the Album's Database. This doesn't delete the images the tag was assigned to.</action></para></listitem> </varlistentry> </variablelist> @@ -139,7 +152,7 @@ <term><menuchoice> <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, ⪚ &gwenview;.</action></para></listitem> + <listitem><para><action>Opens the selected item in the default application according to the mimetype, ⪚ Gwenview.</action></para></listitem> </varlistentry> <varlistentry> @@ -381,6 +394,7 @@ <sect2> <title>The Edit Menu</title> <para> + Beside the usual "Cut", "Copy" and "Paste" the Edit Menu contains the following items: <variablelist> <varlistentry> @@ -396,12 +410,12 @@ <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu><guimenuitem>Select None</guimenuitem> </menuchoice></term> - <listitem><para><action>Unselect all items in the current view</action></para></listitem> + <listitem><para><action>Un-select all items in the current view</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo> </shortcut> + <shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem> </menuchoice></term> <listitem><para><action>Invert the current selection</action></para></listitem> @@ -421,10 +435,49 @@ <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo> </shortcut> - <guimenu>View</guimenu><guimenuitem>Full Screen Mode</guimenuitem> + <guimenu>View</guimenu><guimenuitem>Thumbnails</guimenuitem> + </menuchoice></term> + <listitem><para><action>Shows thumbnails in the <link linkend="using-mainwindow-imageview">Image Area</link></action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo> </shortcut> + <guimenu>View</guimenu><guimenuitem>Preview Image</guimenuitem> + </menuchoice></term> + <listitem><para><action>Shows additionally a preview in the Image Area.</action></para> + <para> + The preview has "Back" and "Forward" buttons at the top left corner to navigate through all the images currently shown. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>View</guimenu><guimenuitem>Map</guimenuitem> + </menuchoice></term> + <listitem><para><action>Shows images on a map.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>View</guimenu><guimenuitem>Table</guimenuitem> </menuchoice></term> - <listitem><para><action>Switch to full screen (same as F11).</action></para></listitem> + <listitem> + <para> + <action> + 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> + By default you have these four items also on the main toolbar. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> </varlistentry> <varlistentry> @@ -461,7 +514,7 @@ <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Alt;&Shift;<keycap>F9</keycap></keycombo> </shortcut> - <guimenu>View</guimenu><guisubmenu>Slideshow</guisubmenu><guimenuitem>Advanced Slideshow...</guimenuitem> + <guimenu>View</guimenu><guisubmenu>Slideshow</guisubmenu><guimenuitem>Presentation...</guimenuitem> </menuchoice></term> <listitem> <para><action> @@ -477,7 +530,20 @@ <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo> </shortcut> + <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo> </shortcut> + <guimenu>View</guimenu><guimenuitem>Full Screen Mode</guimenuitem> + </menuchoice></term> + <listitem><para><action>Switch to full screen (Return with the same keyboard shortcut).</action></para></listitem> + </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <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> @@ -485,15 +551,20 @@ <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> </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>0</keycap></keycombo> </shortcut> + <shortcut><keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo> </shortcut> <guimenu>View</guimenu><guimenuitem>Zoom to 100%</guimenuitem> </menuchoice></term> <listitem><para><action>Will show the image 1:1 (meaning 1 image pixel is mapped exactly to 1 screen pixel) in preview mode.</action></para></listitem> @@ -502,12 +573,17 @@ <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul"> - &Ctrl;&Shift;<keycap>E</keycap> + &Ctrl;&Alt;<keycap>E</keycap> </keycombo></shortcut> <guimenu>View</guimenu><guimenuitem>Fit to Window</guimenuitem> </menuchoice></term> <listitem><para><action>Will size the image as to fit snug into the window.</action></para></listitem> </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> <!-- <varlistentry> <term><menuchoice> @@ -521,14 +597,35 @@ <term><menuchoice> <guimenu>View</guimenu><guisubmenu>Sort Albums</guisubmenu> </menuchoice></term> - <listitem><para><action>Sort all &digikam; Albums by Folder, by Collection, or by Date.</action></para></listitem> + <listitem><para><action>Sort all &digikam; Albums by Folder, by Category or by Date.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>View</guimenu><guisubmenu>Sort Images</guisubmenu> </menuchoice></term> - <listitem><para><action>Sort all images in current Album by Name, Path, Date, File Size or by Rating.</action></para></listitem> + <listitem><para><action>Sort all images in current Album by Name, Path, Date, File Size, Rating, Image Size or by Aspect Ratio.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>View</guimenu><guisubmenu>Image Sorting Order</guisubmenu> + </menuchoice></term> + <listitem><para><action>Select whether images should be sorted in ascending or descending order.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>View</guimenu><guisubmenu>Group Images</guisubmenu> + </menuchoice></term> + <listitem><para><action>Select whether images should be shown un-grouped (Flat List) or grouped by album or by format.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>View</guimenu><guisubmenu>Group Sorting Order</guisubmenu> + </menuchoice></term> + <listitem><para><action>Select whether groups should be sorted in ascending or descending order.</action></para></listitem> </varlistentry> <varlistentry> @@ -544,6 +641,24 @@ </menuchoice></term> <listitem><para><action>If a hierarchical tag structure exists, the currently selected branch will be displayed in full depth.</action></para></listitem> </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul"><keycap>F12</keycap></keycombo> </shortcut> + <guimenu>View</guimenu><guimenuitem>Color-Managed View</guimenuitem> + </menuchoice></term> + <listitem><para><action>Toggles between showing thumbnails and preview in color-managed mode or not.</action></para> + <para> + For more information about color management see + <link linkend="editor-cm">this</link> + lengthy chapter. + </para></listitem> + </varlistentry> </variablelist> </para> @@ -559,95 +674,127 @@ <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut> - <guimenu>Tools</guimenu><guimenuitem>Search...</guimenuitem> + <guimenu>Tools</guimenu><guimenuitem>Image Editor</guimenuitem> </menuchoice></term> <listitem> <para><action> - Launch the simple search items dialog. + Opens the &digikam; Image Editor. </action></para> - </listitem> + </listitem> </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Alt;&Ctrl;<keycap>F</keycap></keycombo> </shortcut> - <guimenu>Tools</guimenu><guimenuitem>Advanced Search...</guimenuitem> + <shortcut><keycombo action="simul"><keycap>L</keycap></keycombo> </shortcut> + <guimenu>Tools</guimenu><guimenuitem>Light Table</guimenuitem> </menuchoice></term> <listitem> <para><action> - Launch the advanced search items dialog. + Switches to the Light Table window. </action></para> - </listitem> + </listitem> </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul"><keycap>L</keycap></keycombo> </shortcut> - <guimenu>Tools</guimenu><guimenuitem>Light Table</guimenuitem> + <shortcut><keycombo action="simul"><keycap>B</keycap></keycombo> </shortcut> + <guimenu>Tools</guimenu><guimenuitem>Batch Queue Manager</guimenuitem> </menuchoice></term> <listitem> <para><action> - Switches to the Light Table window. + Opens the Batch Queue Manager window. </action></para> </listitem> </varlistentry> <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut> + <guimenu>Tools</guimenu><guimenuitem>Search...</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Switches to the Search View with focus on the simple search field. + </action></para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>F</keycap></keycombo> </shortcut> + <guimenu>Tools</guimenu><guimenuitem>Advanced Search...</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Switches to the Search View and launches the advanced search dialog. + </action></para> + </listitem> + </varlistentry> + + <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu><guimenuitem>Find Duplicates</guimenuitem> </menuchoice></term> <listitem> <para><action> - Tool to find duplicate images in Albums Database. + Leads to the "Duplicates" tab in the Fuzzy View. </action></para> <para> - See the dedicated - <link linkend="tool-findduplicates">Find Duplicates Tool</link> + See + <link linkend="using-mainwindow-fuzzysearches">Fuzzy View</link> for more information. </para> - </listitem> + </listitem> </varlistentry> <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> <term><menuchoice> - <guimenu>Tools</guimenu><guimenuitem>Scan for New Images...</guimenuitem> + <guimenu>Tools</guimenu><guimenuitem>Maintenance...</guimenuitem> </menuchoice></term> <listitem> <para><action> - Rescan the library for images not yet in the database (see also <link linkend="rescan-items">start-up option</link>). + Opens the maintenance tool. </action></para> + <para> + For a detailed description see <link linkend="tool-maintenance">this Chapter</link> + </para> </listitem> </varlistentry> <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> <term><menuchoice> - <guimenu>Tools</guimenu><guimenuitem>Rebuild all Thumbnails...</guimenuitem> + <guimenu>Tools</guimenu><guimenuitem>Blend Bracketed or Focus Stack Images...</guimenuitem> </menuchoice></term> <listitem> <para><action> - Launch rebuild of all thumbnails (that can take a long time if you have many images). + TODO </action></para> </listitem> </varlistentry> -<!-- + <varlistentry> <term><menuchoice> - <guimenu>Tools</guimenu><guimenuitem>Rebuild all Fingerprints...</guimenuitem> - </menuchoice></term> - <listitem> - <para><action>???</action></para> - </listitem> - </varlistentry> ---> - <varlistentry id="update-db-metadata"> - <term><menuchoice> - <guimenu>Tools</guimenu><guimenuitem>Synchronize all Images with Database...</guimenuitem> + <guimenu>Tools</guimenu><guimenuitem>Create Panorama...</guimenuitem> </menuchoice></term> <listitem> <para><action> - Launch synchronization of all metadata between database and files for all files (not just current view as with <link linkend="synchronize-metadata">this</link> menu). Database metadata will be overwritten with the file's metadata in case of discrepancy. The opposite you can do from the <link linkend="synchronize-metadata">Album</link> menu. + TODO </action></para> </listitem> </varlistentry> @@ -667,6 +814,22 @@ </para> </listitem> </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Tools</guimenu><guimenuitem>Email Images...</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Tool to send images with your favorite email client. + </action></para> + <para> + See the dedicated + <link linkend="tool-sendimages">Send Images Tool</link> + for more information. + </para> + </listitem> + </varlistentry> </variablelist> </para> @@ -678,41 +841,62 @@ <sect2> <title>The Import Menu</title> <variablelist> - <para> - Any configured digital camera will be listed here. You can use the "Add Camera" menu entry to add a new camera to the list. Please, read the <link linkend="cameraselection.anchor">Setup Camera Section</link> for more information. - </para> <varlistentry> <term><menuchoice> - <guimenu>Import</guimenu><guimenuitem>Media Browse</guimenuitem> + <guimenu>Import</guimenu><guimenuitem>Cameras</guimenuitem> </menuchoice></term> - <listitem><para><action>Browsing attached media devices like card readers, DVDs or memory sticks.</action></para></listitem> + <listitem><para><action>Any configured digital camera will be listed here. You can use the "Add Camera Manually..." menu entry to add a new camera to the list. Please, read the <link linkend="using-setup-camera">Camera Settings</link> for more information.</action></para> + <para> + Once you choose a camera from the list the Camera Interface will open. For a detailed description see <link linkend="using-camera-intro">Using a Digital Camera With &digikam;.</link>. + </para> + </listitem> </varlistentry> - <varlistentry> + <varlistentry> <term><menuchoice> - <guimenu>Import</guimenu><guimenuitem>Add camera</guimenuitem> + <guimenu>Import</guimenu><guimenuitem>USB Storage Devices</guimenuitem> </menuchoice></term> - <listitem><para><action>Interactively add a new camera.</action></para></listitem> + <listitem><para><action>All currently mounted USB storage devices will be listed here. The function will open the same <link linkend="using-camera-intro">interface</link> as the Import/Cameras menu item.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> - <shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> + <guimenu>Import</guimenu><guimenuitem>Card Readers</guimenuitem> + </menuchoice></term> + <listitem><para><action>All currently mounted card readers will be listed here. The function will open the same <link linkend="using-camera-intro">interface</link> as the Import/Cameras menu item.</action></para></listitem> + </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Import</guimenu><guimenuitem>Add Images...</guimenuitem> </menuchoice></term> - <listitem><para><action>Navigate to a folder and select images</action></para></listitem> + <listitem><para><action>After asking for the source folder with the standard Open dialog of your OS the function will display the images in that folder in the same <link linkend="using-camera-intro">interface</link> as the Import/Cameras menu item.</action></para> + <para> + This item is only active in the Albums View. + </para> + </listitem> </varlistentry> - <varlistentry> + <varlistentry> <term><menuchoice> <guimenu>Import</guimenu><guimenuitem>Add Folders...</guimenuitem> </menuchoice></term> - <listitem><para><action>Navigate to a folder and import it entirely</action></para></listitem> + <listitem><para><action>Navigate to a folder and import it entirely</action></para> + <para> + This item is only active in the Albums View. + </para> + </listitem> </varlistentry> - <varlistentry> + <varlistentry> <term><menuchoice> - <guimenu>Import</guimenu><guimenuitem>Scan Images...</guimenuitem> + <guimenu>Import</guimenu><guimenuitem>Import from Scanner...</guimenuitem> </menuchoice></term> <listitem><para><action>Opens a scanner dialog</action></para> <para> @@ -722,6 +906,25 @@ </para> </listitem> </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Import</guimenu><guimenuitem>Import from ...</guimenuitem> + </menuchoice></term> + <listitem><para><action>Here are following the import menu items for the webservices you have chosen in </action></para> + <para> + <menuchoice> + <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;...</guisubmenu><guimenuitem>Plugins</guimenuitem> + </menuchoice> + and which are labeled <quote>Export</quote> in the <quote>Categories</quote> column. + </para> + </listitem> + </varlistentry> </variablelist> @@ -875,6 +1078,18 @@ </menuchoice></term> <listitem><para><action>Enable or disable the main &digikam; toolbar.</action></para></listitem> </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo> </shortcut> + <guimenu>Settings</guimenu><guimenuitem>Show Menubar</guimenuitem> + </menuchoice></term> + <listitem><para><action>Enable or disable the main &digikam; menu bar.</action></para> + <para> + Remind the keyboard shortcut in order to be able to get it back! Another way is the context menu within the Image Area. + </para> + </listitem> + </varlistentry> <varlistentry> <term><menuchoice> @@ -885,9 +1100,34 @@ <varlistentry> <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo> </shortcut> + <guimenu>Settings</guimenu><guimenuitem>Show Thumbbar</guimenuitem> + </menuchoice></term> + <listitem><para><action>Enable or disable the thumbbar in the &digikam; Image Area.</action></para> + <para> + This item is only active while a preview is displayed because it is meant to make more space for the preview in the Image Area. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>______________________________</term> + <listitem><para></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Settings</guimenu><guimenuitem>Themes</guimenuitem> + </menuchoice></term> + <listitem><para><action>Choose from a list (submenu) of predefined color themes for the appearance of &digikam;.</action></para></listitem> + </varlistentry> + + + <varlistentry> + <term><menuchoice> <guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> - <listitem><para><action>Configure the &digikam; shortcuts.</action></para></listitem> + <listitem><para><action>Configure the &digikam; shortcuts and manage different schemes of shortcuts.</action></para></listitem> </varlistentry> <varlistentry> @@ -899,9 +1139,31 @@ <varlistentry> <term><menuchoice> + <guimenu>Settings</guimenu><guimenuitem>Configure Notifications...</guimenuitem> + </menuchoice></term> + <listitem><para><action>Configure the &digikam; notifications including actions like "Play a sound", "Log to a file" or "Run command".</action></para></listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Settings</guimenu><guimenuitem>Database Migration...</guimenuitem> + </menuchoice></term> + <listitem><para><action>Launch tool to migrate the &digikam; databases from SQLite to MySQL or vice versa.</action></para> + <para> + Find more information about the databases and database migration in the setup section about <link linkend="using-setup-database">&digikam; databases</link>. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> <guimenu>Settings</guimenu><guimenuitem>Configure &digikam;...</guimenuitem> </menuchoice></term> - <listitem><para><action>Launch &digikam; configure dialog.</action></para></listitem> + <listitem><para><action>Launch &digikam; configure dialog.</action></para> + <para> + For a detailed description see <link linkend="using-setup">&digikam; Configuration</link>. + </para> + </listitem> </varlistentry> </variablelist> @@ -910,22 +1172,55 @@ </sect2> <sect2> <title>The Help Menu</title> + <para> <variablelist> <varlistentry> <term><menuchoice> <guimenu>Help</guimenu><guimenuitem>Supported RAW Cameras</guimenuitem> </menuchoice></term> - <listitem><para><action>Displays a live filter of all supported RAW format cameras.</action></para></listitem> + <listitem><para><action>Displays a live filter of all supported RAW format cameras.</action></para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="menu-rawcamerasupport.png" format="PNG"/></imageobject> + <textobject> <phrase>RAW camera support</phrase> </textobject> + </inlinemediaobject> + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Help</guimenu><guimenuitem>Components Information</guimenuitem> + </menuchoice></term> + <listitem><para><action>Displays an information panel with shared libraries and components.</action></para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="menu-componentsinfo.png" format="PNG"/></imageobject> + <textobject> <phrase>RAW camera support</phrase> </textobject> + </inlinemediaobject> + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Help</guimenu><guimenuitem>Database Statistics</guimenuitem> + </menuchoice></term> + <listitem><para><action>Displays an information panel with a database summary.</action></para> + + <para> + <inlinemediaobject> + <imageobject><imagedata fileref="menu-databasestatistics.png" format="PNG"/></imageobject> + <textobject> <phrase>RAW camera support</phrase> </textobject> + </inlinemediaobject> + </para> + </listitem> </varlistentry> </variablelist> - <para> - <inlinemediaobject> - <imageobject><imagedata fileref="menu-rawcamerasupport.png" format="PNG"/></imageobject> - <textobject> <phrase>RAW camera support</phrase> </textobject> - </inlinemediaobject> </para> - </sect2> </sect1> diff --git a/digikam/menu-rawcamerasupport.png b/digikam/menu-rawcamerasupport.png index 833ff69..921b21a 100644 Binary files a/digikam/menu-rawcamerasupport.png and b/digikam/menu-rawcamerasupport.png differ diff --git a/digikam/using-camera-intro.docbook b/digikam/using-camera-intro.docbook index 18df18d..03d24c3 100644 --- a/digikam/using-camera-intro.docbook +++ b/digikam/using-camera-intro.docbook @@ -1,33 +1,71 @@ <sect2 id="using-camera-intro"> - <title>Introduction to Camera Interface</title> + <title>Introduction to the Import Interface</title> <para> - The Camera Tool allows you to download your photographs directly from your camera into a &digikam; Album. You can access the Camera Tool by clicking on the Camera menu and selecting from the list of configured cameras. See the <link linkend="using-setup-camera">Setup Camera Section</link> of the manual for instructions on how to setup &digikam; to work with your camera. If you want to have more information about how &digikam; supports digital cameras, please a take a look at <link linkend="intro-camerasupport">this section</link>. + The Import Interface helps you to get photographs into a &digikam; Album, whether it is directly from your camera, from a USB mass storage device, via a card reader or from a local or remote folder. You can access the Import Interface by + <variablelist> + <varlistentry> + <term><menuchoice> + <guimenu>Import</guimenu><guimenuitem>Cameras</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Select one of the cameras from the submenu or choose <guilabel>Add Camera Manually...</guilabel>. + </action></para> + <para> + The latter will open the dialog described in the <link linkend="using-setup-camera">Camera Settings</link> section of this handbook. If you want to have more information about how &digikam; supports digital cameras, please a take a look at <link linkend="intro-camerasupport">this section</link>. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Import</guimenu><guimenuitem>USB Storage Devices</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Select one of the USB devices from the submenu. + </action></para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <guimenu>Import</guimenu><guimenuitem>Card Readers</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Select one of the card readers from the submenu. + </action></para> + </listitem> + </varlistentry> + + <varlistentry> + <term><menuchoice> + <shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>I</keycap></keycombo></shortcut> + <guimenu>Import</guimenu><guimenuitem>Add Images...</guimenuitem> + </menuchoice></term> + <listitem> + <para><action> + Select a source folder from the following dialog. + </action></para> + </listitem> + </varlistentry> + </variablelist> </para> <para> - The Camera Interface is not the only way to get your photographs into &digikam;. See the <link linkend="using-addphototoalbum">Adding a photograph to an Album</link> section for a description of how to add photographs that are already on your hard disk. But Camera Interface provides a lots of advanced settings to import images into your albums database. + 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> - 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 you camera's user manual if you need more information. - </para> - - <para> - When you start the Camera Interface, it will try to connect to the Camera. For some cameras this connection phase can take a little while. When connected, a <guilabel>Ready</guilabel> indicator will appear on the bottom and thumbnails of any photographs on the camera will be displayed. Some cameras cannot provide thumbnails of the photographs. If this is the case, you will only see the filenames and a mime-type icon for each item stored by your camera (photograph, movies, sounds, etc). - </para> - - <example> - - <title>The Camera Client Window</title> - <screenshot> + <screenshot> <screeninfo>The Camera Client Window</screeninfo> <mediaobject><imageobject> <imagedata fileref="&path;using-camera-maininterface.png" format="PNG" /> </imageobject></mediaobject> </screenshot> - - </example> + </para> </sect2> diff --git a/digikam/using-camera-maininterface.png b/digikam/using-camera-maininterface.png index 1e7fc86..71af70a 100644 Binary files a/digikam/using-camera-maininterface.png and b/digikam/using-camera-maininterface.png differ
