Git commit cfc86fe80ec168f61cb1a968c37edd38c964ddb6 by Yuri Chornoivan. Committed on 04/09/2016 at 12:28. Pushed by yurchor into branch 'master'.
Fix minor issues M +1 -1 digikam/intro-movieformats.docbook M +6 -6 digikam/using-mainwindow.docbook http://commits.kde.org/digikam-doc/cfc86fe80ec168f61cb1a968c37edd38c964ddb6 diff --git a/digikam/intro-movieformats.docbook b/digikam/intro-movieformats.docbook index 37edb28..1cca914 100644 --- a/digikam/intro-movieformats.docbook +++ b/digikam/intro-movieformats.docbook @@ -26,7 +26,7 @@ &digikam; relies on <ulink url="http://doc.qt.io/qt-5/multimediaoverview.html";>Qt5 Multimedia framework</ulink> to handle video files. You must take a care to have installed all parts of this frameworks on your computer, and especially the multimedia plugins interface. This framework will able to play video files depending on the availability of video codecs - installed on your system. &digikam; do not include extra video codec. This codecs are loaded on demand at running time. + installed on your system. &digikam; do not include extra video codec. These codecs are loaded on demand at running time. </para> <para> diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook index cb59f98..feea72d 100644 --- a/digikam/using-mainwindow.docbook +++ b/digikam/using-mainwindow.docbook @@ -13,11 +13,11 @@ <title>Areas and Bars</title> <para> - &digikam;'s main window has two areas in the center showing your photographs. One is the <firstterm>Icon Area</firstterm>, showing thumbnails of the content of the selected album or of a search result, and the other one the <firstterm>Preview</firstterm>, showing the selected image. Together let's call them the <link linkend="using-imagearea">Image Area</link>. In the top left corner of the Preview we have a few buttons for moving back and forth through the content of the album, for rotating the image, for showing or adding face tags and to switch to fullscreen mode. By clicking on the preview you can make it disappear and by clicking on the picture area of a thumbnail open it again. + &digikam;'s main window has two areas in the center showing your photographs. One is the <firstterm>Icon Area</firstterm>, showing thumbnails of the contents of the selected album or of a search result, and the other one the <firstterm>Preview</firstterm>, showing the selected image. Together let's call them the <link linkend="using-imagearea">Image Area</link>. In the top left corner of the Preview we have a few buttons for moving back and forth through the content of the album, for rotating the image, for showing or adding face tags and to switch to fullscreen mode. By clicking on the preview you can make it disappear and by clicking on the picture area of a thumbnail open it again. </para> <para> - The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between eight <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search) and People (Tags). The Right Sidebar can be used to show all information about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars there will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show information. + The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between eight <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search) and People (Tags). The Right Sidebar can be used to show all information about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars they will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show information. </para> <para> @@ -256,7 +256,7 @@ </para> <para> - You can also batch rename photographs. One method is to use the <link linkend="bqm.anchor">Batch Queue Manager</link> (B). Another one is to select multiple photographs and then press F2. A dialog will open showing the list of selected photographs with their current name and the new name. These two are identical at first until you place the cursor in the input field, type in something and/or select a modifier from the buttons below. Make use of the tooltips! + You can also batch rename photographs. One method is to use the <link linkend="bqm.anchor">Batch Queue Manager</link> (B). Another one is to select multiple photographs and then press <keycap>F2</keycap>. A dialog will open showing the list of selected photographs with their current name and the new name. These two are identical at first until you place the cursor in the input field, type in something and/or select a modifier from the buttons below. Make use of the tooltips! </para> </sect3> @@ -289,7 +289,7 @@ <para> By clicking the <quote>Albums</quote> button on the left side bar you toggle the <quote>Albums</quote> tree which provides an organized view of your photograph albums. The top item <quote>Albums</quote> just shows the <quote>welcome to &digikam;</quote> screen in the view area. The next level of the <quote>Albums</quote> tree shows your different Collections (marked by the <inlinemediaobject><imageobject><imagedata fileref="&path;using-mainwindow-icon-collection.png" format="PNG" /> </imageobject> - </inlinemediaobject> icon) or at least one if you haven't added one or more yet in the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> Collections section. Each Collection represents a folder branch on your harddisk, on removable media or on network shares and the next levels in the tree show the structure of those folders, here called <quote>Albums</quote>. The albums can be sorted by their folder layout on the hard disk, by the Category that has been set in the <link linkend="albumpropsedit.anchor">Album Properties</link> or by the Date of that Albums (this date can also be changed in the Properties of each Album). You can invert the sort order (ascending/descending) by clicking on the title bar of the album tree. + </inlinemediaobject> icon) or at least one if you haven't added one or more yet in the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> Collections section. Each Collection represents a folder branch on your hard disk, on removable media or on network shares and the next levels in the tree show the structure of those folders, here called <quote>Albums</quote>. The albums can be sorted by their folder layout on the hard disk, by the Category that has been set in the <link linkend="albumpropsedit.anchor">Album Properties</link> or by the Date of that Albums (this date can also be changed in the Properties of each Album). You can invert the sort order (ascending/descending) by clicking on the title bar of the album tree. </para> <para> @@ -318,7 +318,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+I) from the menu bar. Select a source folder from the dialog and click OK. 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+N) from the same menu will copy only those images which are not in the destination folder yet. </para> <para> @@ -360,7 +360,7 @@ <itemizedlist> - <listitem><para>The Album <guilabel>Title</guilabel> : Name of the Album, identical with the name of the folder on your harddisk. If you edit it here, the folder will also be renamed. + <listitem><para>The Album <guilabel>Title</guilabel> : Name of the Album, identical with the name of the folder on your hard disk. If you edit it here, the folder will also be renamed. </para></listitem> <listitem><para>The Album <guilabel>Category</guilabel> : this is a way of grouping your Albums together by a common label. The Category you set will be used to order your albums when you select <guilabel>By Category</guilabel> from the drop down box in the tool bar or using <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Category</guimenuitem></menuchoice>. If you want to add and delete Category labels, choose from the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> and here the Album Category section.
