Git commit ed161c0d0cadc69928ffd7fcf86c12b06322cf36 by Human Dynamo. Committed on 05/02/2018 at 20:25. Pushed by cgilles into branch 'master'.
plugin -> tool M +4 -4 digikam/editor-photoediting.docbook M +0 -8 digikam/index.docbook M +5 -3 digikam/intro-background.docbook D +- -- digikam/intro-plugininterface.png D +0 -26 digikam/intro-pluginsupport.docbook A +- -- digikam/intro-toolsinterface.png M +9 -23 digikam/menu-editor.docbook M +5 -5 digikam/tool-flickrexport.docbook M +1 -1 digikam/tool-printwizard.docbook M +6 -6 digikam/tool-sendimages.docbook M +1 -1 digikam/using-dam-build.docbook M +1 -1 digikam/using-dam-copyright.docbook M +1 -1 digikam/using-dam-intro.docbook D +0 -30 digikam/using-setup-plugins.docbook D +- -- digikam/using-setup-plugins.png M +0 -1 digikam/using-setup.docbook M +1 -1 digikam/using-sidebar-captions.docbook https://commits.kde.org/digikam-doc/ed161c0d0cadc69928ffd7fcf86c12b06322cf36 diff --git a/digikam/editor-photoediting.docbook b/digikam/editor-photoediting.docbook index 1a8d01f..d1ce79f 100644 --- a/digikam/editor-photoediting.docbook +++ b/digikam/editor-photoediting.docbook @@ -38,7 +38,7 @@ If you want to change color space, in particular if you want to work in CIEL*a*b, 16 bit per channel are required to avoid truncation effects. </para> - <para>If you swap step 4 and 5, which is well possible if the initial contrast is already very good, you can do the first 4 adjustment in the same plugin, the white balance</para> + <para>If you swap step 4 and 5, which is well possible if the initial contrast is already very good, you can do the first 4 adjustment in the same tool, the white balance</para> <para>Many of the tools you may need for photographic editing are included with &digikam;. Their description follows here. </para> @@ -110,15 +110,15 @@ </listitem> <listitem> - <para> <emphasis>(4)</emphasis>: The filter or plugin settings area.</para> + <para> <emphasis>(4)</emphasis>: The filter or tool settings area.</para> </listitem> <listitem> - <para><emphasis>(5)</emphasis>: At the lower left corner: there is help and a reset to defaults button (all settings are remembered from the last use of the plugin).</para> + <para><emphasis>(5)</emphasis>: At the lower left corner: there is help and a reset to defaults button (all settings are remembered from the last use of the tool).</para> </listitem> <listitem> - <para><emphasis>(6)</emphasis>: There is a progress indicator for plugins with involved calculations.</para> + <para><emphasis>(6)</emphasis>: There is a progress indicator for tool with involved calculations.</para> </listitem> </itemizedlist> diff --git a/digikam/index.docbook b/digikam/index.docbook index 1dce709..bbc07e8 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -17,7 +17,6 @@ <!ENTITY doc-intro-imageformats SYSTEM "intro-imageformats.docbook"> <!ENTITY doc-intro-movieformats SYSTEM "intro-movieformats.docbook"> <!ENTITY doc-intro-camerasupport SYSTEM "intro-camerasupport.docbook"> - <!ENTITY doc-intro-pluginsupport SYSTEM "intro-pluginsupport.docbook"> <!ENTITY doc-intro-database SYSTEM "intro-database.docbook"> <!-- Using Application Chapter --> @@ -87,7 +86,6 @@ <!ENTITY doc-using-setup-slideshow SYSTEM "using-setup-slideshow.docbook"> <!ENTITY doc-using-setup-quality SYSTEM "using-setup-quality.docbook"> <!ENTITY doc-using-setup-camera SYSTEM "using-setup-camera.docbook"> - <!ENTITY doc-using-setup-plugins SYSTEM "using-setup-plugins.docbook"> <!ENTITY doc-using-setup-misc SYSTEM "using-setup-misc.docbook"> <!ENTITY doc-using-setup-misc-behavior SYSTEM "using-setup-misc-behavior.docbook"> <!ENTITY doc-using-setup-theme SYSTEM "using-setup-theme.docbook"> @@ -159,7 +157,6 @@ <!-- Tools Chapter --> - <!-- native --> <!ENTITY doc-tool-acquireimages SYSTEM "tool-acquireimages.docbook"> <!ENTITY doc-tool-geolocation SYSTEM "tool-geolocationeditor.docbook"> <!ENTITY doc-tool-presentation SYSTEM "tool-presentation.docbook"> @@ -170,8 +167,6 @@ <!ENTITY doc-tool-expoblending SYSTEM "tool-expoblending.docbook"> <!ENTITY doc-tool-calendar SYSTEM "tool-calendar.docbook"> <!ENTITY doc-tool-maintenance SYSTEM "tool-maintenance.docbook"> - - <!-- plugins --> <!ENTITY doc-tool-printwizard SYSTEM "tool-printwizard.docbook"> <!ENTITY doc-tool-sendimages SYSTEM "tool-sendimages.docbook"> <!ENTITY doc-tool-flickrexport SYSTEM "tool-flickrexport.docbook"> @@ -264,7 +259,6 @@ &doc-intro-imageformats; &doc-intro-movieformats; &doc-intro-camerasupport; - &doc-intro-pluginsupport; &doc-intro-database; </chapter> @@ -310,8 +304,6 @@ &doc-tool-calendar; &doc-tool-maintenance; &doc-tool-dlnaserver; - - <!-- plugins --> &doc-tool-printwizard; &doc-tool-sendimages; &doc-tool-flickrexport; diff --git a/digikam/intro-background.docbook b/digikam/intro-background.docbook index 602c6e6..809fd46 100644 --- a/digikam/intro-background.docbook +++ b/digikam/intro-background.docbook @@ -13,11 +13,13 @@ </para> <para> - &digikam; incorporates a fast Image Editor with many image editing tools. You can use the Image Editor to view your photographs, comment and rate them, correct, enhance and alter them. The images post processing can be easily extended by a set of plugins, the <ulink url="https://commits.kde.org/kipi-plugins";>KIPI project</ulink> dedicated to work with remote web services. + &digikam; incorporates a fast Image Editor with many image editing tools. You can use the Image Editor to view your photographs, comment and rate them, correct, enhance and alter them. The images post processing can be easily done by a set of tools though the Batch Queue Manager, or by many import and export tools dedicated to work with remote web services. </para> + <para><inlinemediaobject><imageobject><imagedata fileref="&path;intro-toolsinterface.png" format="PNG" /> </imageobject></inlinemediaobject></para> + <para> - While &digikam; remains easy to use, it provides professional level features by the dozens. It is fully 16 bit enabled including all available plugins, supports RAW format conversion through libraw, DNG export and ICC color management <link linkend="rawprocessing.anchor">work flow</link>. + While &digikam; remains easy to use, it provides professional level features by the dozens. It is fully 16 bit enabled including all available tools, supports RAW format conversion through libraw, DNG export and ICC color management <link linkend="rawprocessing.anchor">work flow</link>. </para> </sect2> @@ -31,7 +33,7 @@ <para> &digikam; makes it as easy as possible for you to report bugs or suggest improvements. Wherever you are in the application the Help menu will include a Report Bugs option. This will display a message box with a highlighted link. Click on the link and your web browser will open the page for the reporting system. All the information required will already be filled in, just follow the instructions for completing your report. </para> - + </sect2> <sect2> diff --git a/digikam/intro-plugininterface.png b/digikam/intro-plugininterface.png deleted file mode 100644 index fc05fb2..0000000 Binary files a/digikam/intro-plugininterface.png and /dev/null differ diff --git a/digikam/intro-pluginsupport.docbook b/digikam/intro-pluginsupport.docbook deleted file mode 100644 index 782d783..0000000 --- a/digikam/intro-pluginsupport.docbook +++ /dev/null @@ -1,26 +0,0 @@ -<sect1 id="using-pluginsupport"> <title>Supported Plugins</title> - - <para> - One of the nicest things about &digikam; is how easily its functionality can be extended, by using <emphasis>plugins</emphasis>. The <ulink url="https://commits.kde.org/kipi-plugins";>Kipi project</ulink> is dedicated to develop a plugin interface for &digikam;. Plugins setup is described in this <link linkend="using-setup-plugins">section</link>. - </para> - - <para> - <inlinemediaobject> - <imageobject><imagedata fileref="&path;intro-plugininterface.png" format="PNG"/></imageobject> - <textobject> <phrase>The &digikam; plugins interface</phrase> </textobject> - </inlinemediaobject> - </para> - - <para> - Plugins are dedicated mostly to export and import images with remote web services. Their advantage is, that it is much easier to add a capability to &digikam; by writing a small plugin than by modifying the &digikam; core. - </para> - -</sect1> - -<!-- -Local Variables: -mode: sgml -sgml-omittag: nil -sgml-shorttag: t -End: ---> diff --git a/digikam/intro-toolsinterface.png b/digikam/intro-toolsinterface.png new file mode 100644 index 0000000..3decbc3 Binary files /dev/null and b/digikam/intro-toolsinterface.png differ diff --git a/digikam/menu-editor.docbook b/digikam/menu-editor.docbook index 10bb3da..fc1ba17 100644 --- a/digikam/menu-editor.docbook +++ b/digikam/menu-editor.docbook @@ -184,7 +184,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to adjust curves manually on the current image <link linkend="editor-color-curves">(help)</link>. + Image Editor tool to adjust curves manually on the current image <link linkend="editor-color-curves">(help)</link>. </action></para> </listitem> </varlistentry> @@ -195,7 +195,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to adjust levels manually on the current image <link linkend="editor-color-levels">(help)</link>. + Image Editor tool to adjust levels manually on the current image <link linkend="editor-color-levels">(help)</link>. </action></para> </listitem> </varlistentry> @@ -323,7 +323,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to correct vignetting of the current image <link linkend="editor-enhance-vignetting">(help)</link>. + Image Editor tool to correct vignetting of the current image <link linkend="editor-enhance-vignetting">(help)</link>. </action></para> </listitem> </varlistentry> @@ -334,7 +334,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to correct lens distortion of the current image <link linkend="editor-enhance-distortion">(help)</link>. + Image Editor tool to correct lens distortion of the current image <link linkend="editor-enhance-distortion">(help)</link>. </action></para> </listitem> </varlistentry> @@ -375,7 +375,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to rotate the current image by any angle in degrees <link linkend="editor-transform-freerotation">(help)</link>. + Image Editor tool to rotate the current image by any angle in degrees <link linkend="editor-transform-freerotation">(help)</link>. </action></para> </listitem> </varlistentry> @@ -424,7 +424,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to shear the current image horizontally or vertically <link linkend="editor-transform-shear">(help)</link>. + Image Editor tool to shear the current image horizontally or vertically <link linkend="editor-transform-shear">(help)</link>. </action></para> </listitem> </varlistentry> @@ -435,7 +435,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to adjust perspective of the current image <link linkend="editor-transform-perspective">(help)</link>. + Image Editor tool to adjust perspective of the current image <link linkend="editor-transform-perspective">(help)</link>. </action></para> </listitem> </varlistentry> @@ -472,7 +472,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to add a decorative border around the current image <link linkend="editor-decorate-border">(help)</link>. + Image Editor tool to add a decorative border around the current image <link linkend="editor-decorate-border">(help)</link>. </action></para> </listitem> </varlistentry> @@ -483,7 +483,7 @@ </menuchoice></term> <listitem> <para><action> - Image Editor plugin to insert text in the current image <link linkend="editor-decorate-inserttext">(help)</link>. + Image Editor tool to insert text in the current image <link linkend="editor-decorate-inserttext">(help)</link>. </action></para> </listitem> </varlistentry> @@ -691,20 +691,6 @@ <sect2> <title>The Help Menu</title> &help.menu.documentation; - <para>Additionally &digikam; Image Editor offers this item:</para> - - <variablelist> - - <varlistentry> - <term><menuchoice> - <guimenu>Help</guimenu><guimenuitem>ImagePlugins' Handbooks</guimenuitem> - </menuchoice></term> - <listitem><para>Launch the help interface with the &digikam; Image Editor - plugins handbooks.</para></listitem> - </varlistentry> - - </variablelist> - </sect2> </sect1> diff --git a/digikam/tool-flickrexport.docbook b/digikam/tool-flickrexport.docbook index 2b829c9..9b5807b 100644 --- a/digikam/tool-flickrexport.docbook +++ b/digikam/tool-flickrexport.docbook @@ -19,7 +19,7 @@ </para> <para> - The FlickrExport plugin can be used to upload an image collection from your + The FlickrExport tool can be used to upload an image collection from your computer to the remote flickr server using the Internet. </para> @@ -27,7 +27,7 @@ <title>Tool initialization on first access</title> <para> - When accessing the plugin for the first time you are taken through the process + When accessing the tool for the first time you are taken through the process of obtaining a token which is used for authentication purposes. The following dialog will popup and a browser window will be launched you will log in to <ulink url="http://www.flickr.com";>Flickr</ulink>: @@ -65,10 +65,10 @@ <title>Regular Tool Usage</title> <para> - When the flickrexport plugin is invoked for second time or later you are + When the flickrexport tool is invoked for second time or later you are greeted with the following dialog, which shows the current access permissions - the Flickr Export plugin has. The uploading process requires <quote>write</quote> - permissions. The plugin doesn't allow any other permissions as of now. You + the Flickr Export tool has. The uploading process requires <quote>write</quote> + permissions. The tool doesn't allow any other permissions as of now. You are then asked if they want to proceed with their current permissions. </para> <figure id="flickrexport-current-permissions-dialog"> diff --git a/digikam/tool-printwizard.docbook b/digikam/tool-printwizard.docbook index 119ce1c..793efe2 100644 --- a/digikam/tool-printwizard.docbook +++ b/digikam/tool-printwizard.docbook @@ -15,7 +15,7 @@ The print wizard is a tool for to print images at the same time. The print wizard allows multiple images to be combined into single sheets of paper in standard photo sizes for printing. The combined images can also be automatically opened with the image editor Gimp for -enhancement or for direct printing using the Gimp-Print plugin. The +enhancement or for direct printing using the Gimp-Print tool. The combined images can also be output directly to jpeg files. </para> diff --git a/digikam/tool-sendimages.docbook b/digikam/tool-sendimages.docbook index cc0610b..1312090 100644 --- a/digikam/tool-sendimages.docbook +++ b/digikam/tool-sendimages.docbook @@ -11,10 +11,10 @@ <title>Send Images Tool</title> -<sect1 id="using-plugin-maildialog"> +<sect1 id="using-tool-maildialog"> <title>Using the Module</title> <para> -With this Kipi-plugin you can e-mail the selected images with your favorite e-mail +With this tool you can e-mail the selected images with your favorite e-mail agent. Resizing images is possible. You can use drag and drop to add more images to the list of images to send. </para> @@ -23,7 +23,7 @@ to the list of images to send. <title>Image Selection</title> <para> -When opening the plugin from the host application, the <guilabel>Email Images Options</guilabel> +When opening the tool from the host application, the <guilabel>Email Images Options</guilabel> dialog will appear with your pre-selected images already in the list at the left part of the dialog. </para> @@ -57,7 +57,7 @@ if you want to send a lot of data. <para> The right part of the dialog is used to change the settings of the images to be sent. These -settings will be remembered when you close the plugin until you change them. +settings will be remembered when you close the tool until you change them. </para> <para> @@ -134,10 +134,10 @@ agent will be started automatically at the end. Press the <guibutton>Close</guib button to close this dialog. </para> -<figure id="sendimages-email-images-plugin"> +<figure id="sendimages-email-images-tool"> <title>The E-mail Images Plugin in Action</title> <mediaobject><imageobject> - <imagedata srccredit="The E-mail Images Plugin in Action" fileref="tool-sendimages-progress.png"/> + <imagedata srccredit="The E-mail Images Tool in Action" fileref="tool-sendimages-progress.png"/> </imageobject></mediaobject> </figure> </sect2> diff --git a/digikam/using-dam-build.docbook b/digikam/using-dam-build.docbook index bc26cfd..0b6a7e5 100644 --- a/digikam/using-dam-build.docbook +++ b/digikam/using-dam-build.docbook @@ -74,7 +74,7 @@ <sect3 id="automatic-metadata"> <title>Automatic metadata generation</title> <para> - How to go about all this metadata business? Firstly, there are already a lot of <command>automatically generated metadata</command>: EXIF data and Makernotes. If you have configured &digikam; with your identity section all imported images will be imprinted with this data set which includes copyrights, all automatic. If you have a GPS track recorded in parallel to your taking the photographs, you can geolocate those images in a single action using the Geolocation plugin. Even if you brought back 1000 images from a shooting session, so far you'll not have spent more than 10 minutes to do all that. And by now you have all camera settings of every shot, lens data like zoom, focus, aperture &etc;, date and time, shooting location, copyrights, authorship, program used, and more. Not bad, isn't it? But we could have done more during the importing, we could have changed the file names to include the date, or place or theme, we could have changed the format to a lossless 16 bit per channel format, we could have automatically separated JPEG and RAW files into their folders. I actually recommend to auto-rename to match an event, a place or a theme. &digikam; provides all date/calendar related grouping so that there's hardly a need for coding the date into the file name. Unless you'd like to do just that to browse your albums with another application that is not calendar savvy. You will buy a new camera one day or you have a second one already, sooner than you believe. The numbering scheme of that new camera will start over at typically IMG_0001.JPG again, creating identical file names to the ones you have already if you do not rename them. By renaming you lessen the chance of inadvertently overwriting them at a later date. Keep the new names clean, use alphanumerics, dashes, underscores and a single period prior to the file extension. + How to go about all this metadata business? Firstly, there are already a lot of <command>automatically generated metadata</command>: EXIF data and Makernotes. If you have configured &digikam; with your identity section all imported images will be imprinted with this data set which includes copyrights, all automatic. If you have a GPS track recorded in parallel to your taking the photographs, you can geolocate those images in a single action using the Geolocation tool. Even if you brought back 1000 images from a shooting session, so far you'll not have spent more than 10 minutes to do all that. And by now you have all camera settings of every shot, lens data like zoom, focus, aperture &etc;, date and time, shooting location, copyrights, authorship, program used, and more. Not bad, isn't it? But we could have done more during the importing, we could have changed the file names to include the date, or place or theme, we could have changed the format to a lossless 16 bit per channel format, we could have automatically separated JPEG and RAW files into their folders. I actually recommend to auto-rename to match an event, a place or a theme. &digikam; provides all date/calendar related grouping so that there's hardly a need for coding the date into the file name. Unless you'd like to do just that to browse your albums with another application that is not calendar savvy. You will buy a new camera one day or you have a second one already, sooner than you believe. The numbering scheme of that new camera will start over at typically IMG_0001.JPG again, creating identical file names to the ones you have already if you do not rename them. By renaming you lessen the chance of inadvertently overwriting them at a later date. Keep the new names clean, use alphanumerics, dashes, underscores and a single period prior to the file extension. </para> <para> diff --git a/digikam/using-dam-copyright.docbook b/digikam/using-dam-copyright.docbook index 05e3cc5..d4f635a 100644 --- a/digikam/using-dam-copyright.docbook +++ b/digikam/using-dam-copyright.docbook @@ -56,7 +56,7 @@ </para> <para> - The digital watermark will be unique per image. &digikam; will provide a plugin for DW in the near future that features batch processing. + The digital watermark will be unique per image. &digikam; will provide a tool for DW in the near future that features batch processing. </para> </sect3> diff --git a/digikam/using-dam-intro.docbook b/digikam/using-dam-intro.docbook index 2c7c16b..25ce87c 100644 --- a/digikam/using-dam-intro.docbook +++ b/digikam/using-dam-intro.docbook @@ -32,7 +32,7 @@ </para> <para> - &digikam; with its libraries and plugins is a unique and comprehensive tool to cover most of DAM tasks, and it does it fast and transparently. Based on open standards on all fronts it will not confine you to a platform or application, rather it puts you into a fast track to manage and find your photographs and to move on if you so please to any other platform, application, system without losing any of your work be it as an occasional user, enthusiast or professional. + &digikam; with its libraries and tools is a unique and comprehensive tool to cover most of DAM tasks, and it does it fast and transparently. Based on open standards on all fronts it will not confine you to a platform or application, rather it puts you into a fast track to manage and find your photographs and to move on if you so please to any other platform, application, system without losing any of your work be it as an occasional user, enthusiast or professional. </para> <para> diff --git a/digikam/using-setup-plugins.docbook b/digikam/using-setup-plugins.docbook deleted file mode 100644 index 05d39bd..0000000 --- a/digikam/using-setup-plugins.docbook +++ /dev/null @@ -1,30 +0,0 @@ -<sect2 id="using-setup-plugins"> - <title>Plugins Settings</title> - - <para> - Kipi is an Image Plugin Interface. It is an interface that is supported by a number of image viewer/editor applications. By providing this interface, &digikam; can take advantage of many plugins that are written to work with any application that implements the Kipi interface. - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-plugins.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - <para> - If your operating system has the Kipi plugins package installed, you will see a list of available plugins. Select those that you want to use and they will be loaded into &digikam;. The plugins will appear as new menu entries in the main menu bar and in the context menu for thumbnails. - </para> - - <para> - Keyboard shortcuts to actions that plugins perform can be set up in the <menuchoice><guimenu>Setting</guimenu><guimenuitem>Configure Shortcuts</guimenuitem></menuchoice> menu. - </para> - -</sect2> - -<!-- -Local Variables: -mode: sgml -sgml-omittag: nil -sgml-shorttag: t -End: ---> diff --git a/digikam/using-setup-plugins.png b/digikam/using-setup-plugins.png deleted file mode 100644 index dbf1708..0000000 Binary files a/digikam/using-setup-plugins.png and /dev/null differ diff --git a/digikam/using-setup.docbook b/digikam/using-setup.docbook index a3fd513..7e61034 100644 --- a/digikam/using-setup.docbook +++ b/digikam/using-setup.docbook @@ -14,7 +14,6 @@ &doc-using-setup-slideshow; &doc-using-setup-quality; &doc-using-setup-camera; - &doc-using-setup-plugins; &doc-using-setup-misc; &doc-using-setup-theme; &doc-using-setup-shortcuts; diff --git a/digikam/using-sidebar-captions.docbook b/digikam/using-sidebar-captions.docbook index 14b0a02..76df3c1 100644 --- a/digikam/using-sidebar-captions.docbook +++ b/digikam/using-sidebar-captions.docbook @@ -46,7 +46,7 @@ <title>Date & Time</title> <para> - In the Date & Time section, which reflects the time of taking the photograph, you can change all values. From the date combo-box a calendar opens, and the time setting spin-box can also be written by directly typing the time. The dating is copied to the EXIF 'Date and Time' field. If you need to change a number of images for their creating time & date, there is a more comfortable method available in Batch Queue Manager. This latter option can be found under <menuchoice><guimenuitem>Image</guimenuitem><guimenuitem>Adjust time & date...</guimenuitem></menuchoice>. Select the images to be changed in the main view and call the plugin. + In the Date & Time section, which reflects the time of taking the photograph, you can change all values. From the date combo-box a calendar opens, and the time setting spin-box can also be written by directly typing the time. The dating is copied to the EXIF 'Date and Time' field. If you need to change a number of images for their creating time & date, there is a more comfortable method available in Batch Queue Manager. This latter option can be found under <menuchoice><guimenuitem>Image</guimenuitem><guimenuitem>Adjust time & date...</guimenuitem></menuchoice>. Select the images to be changed in the main view and call the tool. </para> </sect3>
