Git commit 03aa982886ad517f9d8ebb1eb72db5bab552a064 by Gilles Caulier. Committed on 01/09/2016 at 12:38. Pushed by cgilles into branch 'master'.
share Setup/Metadata between digiKam and Showfoto M +3 -1 TODO M +4 -0 digikam/index.docbook M +- -- digikam/using-setup-metadata-advanced.png M +- -- digikam/using-setup-metadata-behavior.png D +- -- digikam/using-setup-metadata-display.png A +16 -0 digikam/using-setup-metadata-intro.docbook M +- -- digikam/using-setup-metadata-rotation.png A +- -- digikam/using-setup-metadata-views-exif.png A +- -- digikam/using-setup-metadata-views-iptc.png A +- -- digikam/using-setup-metadata-views-markernotes.png A +- -- digikam/using-setup-metadata-views-xmp.png A +40 -0 digikam/using-setup-metadata-views.docbook M +60 -47 digikam/using-setup-metadata.docbook M +21 -1 showfoto/index.docbook http://commits.kde.org/digikam-doc/03aa982886ad517f9d8ebb1eb72db5bab552a064 diff --git a/TODO b/TODO index 0fa4fb4..ce9943e 100644 --- a/TODO +++ b/TODO @@ -118,7 +118,9 @@ using-mainwindow.docbook using-setup.docbook DONE DONE Gilles using-setup-album.docbook using-setup-database.docbook -using-setup-metadata.docbook Add sections about Rotation, Filters, and Advanced tabs +using-setup-metadata.docbook Add sections about Rotation, and Advanced tabs +using-setup-metadata-intro.docbook DONE DONE Gilles +using-setup-metadata-views.docbook using-setup-quality.docbook Need to be created using-setup-templates.docbook using-setup-camera.docbook diff --git a/digikam/index.docbook b/digikam/index.docbook index eda01bc..755e780 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -56,7 +56,11 @@ <!ENTITY doc-using-setup-collections SYSTEM "using-setup-collections.docbook"> <!ENTITY doc-using-setup-album SYSTEM "using-setup-album.docbook"> <!ENTITY doc-using-setup-tooltip SYSTEM "using-setup-tooltip.docbook"> + <!ENTITY doc-using-setup-metadata SYSTEM "using-setup-metadata.docbook"> + <!ENTITY doc-using-setup-metadata-intro SYSTEM "using-setup-metadata-intro.docbook"> + <!ENTITY doc-using-setup-metadata-views SYSTEM "using-setup-metadata-views.docbook"> + <!ENTITY doc-using-setup-templates SYSTEM "using-setup-templates.docbook"> <!ENTITY doc-using-setup-mimetype SYSTEM "using-setup-mimetype.docbook"> <!ENTITY doc-using-setup-editor-iface SYSTEM "using-setup-editor-iface.docbook"> diff --git a/digikam/using-setup-metadata-advanced.png b/digikam/using-setup-metadata-advanced.png index 21b1da8..e282409 100644 Binary files a/digikam/using-setup-metadata-advanced.png and b/digikam/using-setup-metadata-advanced.png differ diff --git a/digikam/using-setup-metadata-behavior.png b/digikam/using-setup-metadata-behavior.png index 764185e..7acf196 100644 Binary files a/digikam/using-setup-metadata-behavior.png and b/digikam/using-setup-metadata-behavior.png differ diff --git a/digikam/using-setup-metadata-display.png b/digikam/using-setup-metadata-display.png deleted file mode 100644 index 5603021..0000000 Binary files a/digikam/using-setup-metadata-display.png and /dev/null differ diff --git a/digikam/using-setup-metadata-intro.docbook b/digikam/using-setup-metadata-intro.docbook new file mode 100644 index 0000000..eb9a658 --- /dev/null +++ b/digikam/using-setup-metadata-intro.docbook @@ -0,0 +1,16 @@ +<sect3 id="using-setup-metadata-intro"> + <title>Introduction</title> + + <para> + Image files can have some meta-data embedded into the image file format. This meta-data can be stored in a number of standard formats as JPEG, TIFF, PNG, JPEG2000, PGF, and RAW files. Meta-data can be read and write in the <ulink url="https://en.wikipedia.org/wiki/Exif";>EXIF</ulink>, <ulink url="https://en.wikipedia.org/wiki/IPTC_Information_Interchange_Model";>IPTC</ulink>, and <ulink url="https://en.wikipedia.org/wiki/Extensible_Metadata_Platform";>XMP</ulink> format if they are present in the file. + </para> + +</sect3> + +<!-- +Local Variables: +mode: sgml +sgml-omittag: nil +sgml-shorttag: t +End: +--> diff --git a/digikam/using-setup-metadata-rotation.png b/digikam/using-setup-metadata-rotation.png index 6488898..d41fbeb 100644 Binary files a/digikam/using-setup-metadata-rotation.png and b/digikam/using-setup-metadata-rotation.png differ diff --git a/digikam/using-setup-metadata-views-exif.png b/digikam/using-setup-metadata-views-exif.png new file mode 100644 index 0000000..6c430ad Binary files /dev/null and b/digikam/using-setup-metadata-views-exif.png differ diff --git a/digikam/using-setup-metadata-views-iptc.png b/digikam/using-setup-metadata-views-iptc.png new file mode 100644 index 0000000..36eca77 Binary files /dev/null and b/digikam/using-setup-metadata-views-iptc.png differ diff --git a/digikam/using-setup-metadata-views-markernotes.png b/digikam/using-setup-metadata-views-markernotes.png new file mode 100644 index 0000000..56fc470 Binary files /dev/null and b/digikam/using-setup-metadata-views-markernotes.png differ diff --git a/digikam/using-setup-metadata-views-xmp.png b/digikam/using-setup-metadata-views-xmp.png new file mode 100644 index 0000000..ef8fc48 Binary files /dev/null and b/digikam/using-setup-metadata-views-xmp.png differ diff --git a/digikam/using-setup-metadata-views.docbook b/digikam/using-setup-metadata-views.docbook new file mode 100644 index 0000000..1de0344 --- /dev/null +++ b/digikam/using-setup-metadata-views.docbook @@ -0,0 +1,40 @@ +<sect3 id="using-setup-metadata-views"> + <title>Metadata Filters</title> + + <para> + TODO + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-views-exif.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-views-makernotes.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-views-iptc.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-views-xmp.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + +</sect3> + +<!-- +Local Variables: +mode: sgml +sgml-omittag: nil +sgml-shorttag: t +End: +--> diff --git a/digikam/using-setup-metadata.docbook b/digikam/using-setup-metadata.docbook index ea99883..a45b258 100644 --- a/digikam/using-setup-metadata.docbook +++ b/digikam/using-setup-metadata.docbook @@ -1,53 +1,66 @@ <sect2 id="using-setup-metadata"> <title>Metadata Settings</title> - <para> - Image files can have some meta-data embedded into the image file format. This meta-data can be stored in a number of standard formats. &digikam; can read meta-data in the EXIF format if it is present in the file. &digikam; can also write captions into the <ulink url="http://www.exif.org";>EXIF information</ulink>. Writing captions to the EXIF section is limited to JPEG images for now (the exiv2 library is in development and will be extended to PNG and TIFF format metadata embedding in the near future). - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-metadata-behavior.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - <para> - These settings allow you to control how &digikam; will deal with this embedded information. - </para> - - <para> - <guilabel>Show images/thumbnails rotated according to orientation tag</guilabel> : this will use any orientation information that your camera has included in the EXIF information to automatically rotate your photographs so that they are the correct way up when displayed. It will not actually rotate the image file, only the display of the image on the screen. If you want to permanently rotate the image on file, you can right-click on the thumbnail and select <guilabel>Auto-rotate/flip according to EXIF orientation</guilabel>. The image will then be rotated on disk and the tag will be reset to "normal". If your camera routinely gets this orientation information wrong you might like to switch this feature off. - </para> - - <para> - <guilabel>Set orientation tag to normal after rotate/flip</guilabel> : the Auto Rotate option automatically corrects the orientation of images taken with digital cameras that have an orientation sensor. The camera adds an orientation tag to the image's EXIF meta-data. &digikam; can read this tag to adjust the image accordingly. If you manually rotate an image, this meta-data will be incorrect. This option will set the orientation tag to "Normal" after an adjustment, assuming that you rotated it to the correct orientation. Switch this off if you don't want &digikam; to make changes to the orientation tag, when you rotate or flip the image. - </para> - - <para> - The <guilabel>IPTC Actions</guilabel> will save the data into the respective IPTC fields, which ensures a permanent metadata storage in the image and not only in &digikam;'s database. Thus, metadata is persistent across applications, and may be exported or imported into &digikam; without loss. - </para> - - <para> - <guilabel>Save image captions as embedded text</guilabel> : this will synchronize the captions that you add to your photographs with those in embedded in the image. This is useful because the captions embedded in the image can be read by other image viewers. Care should be taken if you have images that already have captions embedded in them because these captions will be overwritten by the captions made within &digikam;. - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-metadata-rotation.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-metadata-display.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> - - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-metadata-advanced.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> + &doc-using-setup-metadata-intro; + + <sect3 id="using-setup-metadata-behavior"> + <title>Behavior Settings</title> + + <para> + These settings allow you to control how &digikam; will deal with this embedded information. + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-behavior.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + <para> + The <guilabel>IPTC Actions</guilabel> will save the data into the respective IPTC fields, which ensures a permanent metadata storage in the image and not only in &digikam;'s database. Thus, metadata is persistent across applications, and may be exported or imported into &digikam; without loss. + </para> + + <para> + <guilabel>Save image captions as embedded text</guilabel> : this will synchronize the captions that you add to your photographs with those in embedded in the image. This is useful because the captions embedded in the image can be read by other image viewers. Care should be taken if you have images that already have captions embedded in them because these captions will be overwritten by the captions made within &digikam;. + </para> + + </sect3> + + <sect3 id="using-setup-metadata-rotation"> + <title>Rotation Settings</title> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-rotation.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + <para> + <guilabel>Show images/thumbnails rotated according to orientation tag</guilabel> : this will use any orientation information that your camera has included in the EXIF information to automatically rotate your photographs so that they are the correct way up when displayed. It will not actually rotate the image file, only the display of the image on the screen. If you want to permanently rotate the image on file, you can right-click on the thumbnail and select <guilabel>Auto-rotate/flip according to EXIF orientation</guilabel>. The image will then be rotated on disk and the tag will be reset to "normal". If your camera routinely gets this orientation information wrong you might like to switch this feature off. + </para> + + <para> + <guilabel>Set orientation tag to normal after rotate/flip</guilabel> : the Auto Rotate option automatically corrects the orientation of images taken with digital cameras that have an orientation sensor. The camera adds an orientation tag to the image's EXIF meta-data. &digikam; can read this tag to adjust the image accordingly. If you manually rotate an image, this meta-data will be incorrect. This option will set the orientation tag to "Normal" after an adjustment, assuming that you rotated it to the correct orientation. Switch this off if you don't want &digikam; to make changes to the orientation tag, when you rotate or flip the image. + </para> + + </sect3> + + &doc-using-setup-metadata-views; + + <sect3 id="using-setup-metadata-advanced"> + <title>Advanced Settings</title> + + <para> + TODO + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-metadata-advanced.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + + </sect3> </sect2> diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 5ca2b6a..12497e1 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -23,6 +23,8 @@ <!ENTITY doc-using-sidebar-filters SYSTEM "../digikam/using-sidebar-filters.docbook"> <!ENTITY doc-using-sidebar-tools SYSTEM "../digikam/using-sidebar-tools.docbook"> + <!ENTITY doc-using-setup-metadata-intro SYSTEM "../digikam/using-setup-metadata-intro.docbook"> + <!ENTITY doc-using-setup-metadata-views SYSTEM "../digikam/using-setup-metadata-views.docbook"> <!ENTITY doc-using-setup-editor-iface SYSTEM "../digikam/using-setup-editor-iface.docbook"> <!ENTITY doc-using-setup-editor-save SYSTEM "../digikam/using-setup-editor-save.docbook"> <!ENTITY doc-using-setup-editor-raw SYSTEM "../digikam/using-setup-editor-raw.docbook"> @@ -196,7 +198,25 @@ </para> <!-- &doc-using-setup-tooltip; --> - <!-- &doc-using-setup-metadata; --> + + <sect2 id="using-setup-metadata"> + <title>Metadata Settings</title> + + &doc-using-setup-metadata-intro; + + <sect3 id="using-setup-metadata-behavior"> + <title>Behavior Settings</title> + + <para> + TODO + </para> + + </sect3> + + &doc-using-setup-metadata-views; + + </sect2> + &doc-using-setup-editor-iface; &doc-using-setup-editor-save; &doc-using-setup-editor-raw;
