[digikam-doc] /: apply patches about using sidebars description
Gilles Caulier
null at kde.org
Wed Jan 4 13:15:53 UTC 2017
Git commit 542f5a7f6987ba2267f71a72561afde566f60811 by Gilles Caulier, on behalf of Wolfgang Scheffner.
Committed on 04/01/2017 at 13:15.
Pushed by cgilles into branch 'master'.
apply patches about using sidebars description
M +1 -0 digikam/index.docbook
M +11 -13 digikam/using-sidebar-colors.docbook
M +7 -3 digikam/using-sidebar-intro.docbook
M +10 -14 digikam/using-sidebar-properties.docbook
M +- -- digikam/using-sidebar-properties.png
M +12 -14 digikam/using-sidebar-tools.docbook
A +- -- digikam/using-sidebar-versions-clist.png
A +- -- digikam/using-sidebar-versions-tree.png
M +2 -1 digikam/using-sidebar.docbook
M +3 -0 showfoto/index.docbook
https://commits.kde.org/digikam-doc/542f5a7f6987ba2267f71a72561afde566f60811
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 16cd6ae..ed27e16 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -39,6 +39,7 @@
<!ENTITY doc-using-sidebar-colors SYSTEM "using-sidebar-colors.docbook">
<!ENTITY doc-using-sidebar-maps SYSTEM "using-sidebar-maps.docbook">
<!ENTITY doc-using-sidebar-captions SYSTEM "using-sidebar-captions.docbook">
+ <!ENTITY doc-using-sidebar-versions SYSTEM "using-sidebar-versions.docbook">
<!ENTITY doc-using-sidebar-filters SYSTEM "using-sidebar-filters.docbook">
<!ENTITY doc-using-sidebar-tools SYSTEM "using-sidebar-tools.docbook">
diff --git a/digikam/using-sidebar-colors.docbook b/digikam/using-sidebar-colors.docbook
index 2c3e9d9..7277c77 100644
--- a/digikam/using-sidebar-colors.docbook
+++ b/digikam/using-sidebar-colors.docbook
@@ -2,7 +2,7 @@
<title>Colors</title>
<para>
- The colors sidebar has two sub tabs <guilabel>Color and ICC Profile</guilabel>. Here are more details about <link linkend="using-iccprofile">Color Management</link>
+ The colors sidebar has two sub tabs <guilabel>Color</guilabel> and <guilabel>ICC Profile</guilabel>. Here are more details about <link linkend="using-iccprofile">Color Management</link>
</para>
<sect3 id="using-histogramviewer">
@@ -15,21 +15,19 @@
</para>
<para>
- The Histogram Viewer shows the statistical distribution of color values in the current image. It is purely informational: nothing you do with it will cause any change to the image. If you want to perform a histogram based color correction, use the Adjust Levels or Adjust Curves Image Editor plugin.
+ The Histogram Viewer shows the statistical distribution of color values in the current image. It is purely informational: nothing you do with it will cause any change to the image. If you want to perform a histogram based color correction, use for example Color Balance, Levels Adjust or Curves Adjust in the Image Editor.
</para>
- <example>
- <title>The Histogram Viewer in Action</title>
- <screenshot>
- <screeninfo>The Histogram Viewer in Action</screeninfo>
- <mediaobject><imageobject>
+ <para>
+ <inlinemediaobject>
+ <imageobject>
<imagedata fileref="&path;using-sidebar-histogramview.png" format="PNG" />
- </imageobject></mediaobject>
- </screenshot>
- </example>
+ </imageobject>
+ </inlinemediaobject>
+ </para>
<para>
- An image can be decomposed into <guilabel>Red</guilabel>, <guilabel>Green</guilabel>, <guilabel>Blue</guilabel>, <guilabel>Alpha</guilabel> color channels. <guilabel>Alpha</guilabel> channel is a Layer in the image that supports transparency (like PNG or &GIF; images). Each channel supports a range of intensity levels from 0 to 255 (integer valued). Thus, a black pixel is encoded by 0 on all color channels; a white pixel by 255 on all color channels. A transparent pixel is encoded by 0 on the alpha channel; an opaque pixel by 255.
+ An image can be decomposed into <guilabel>Red</guilabel>, <guilabel>Green</guilabel> and <guilabel>Blue</guilabel> color channels. <guilabel>Alpha</guilabel> channel is a Layer in the image that supports transparency (like PNG or &GIF; images). Each channel supports a range of intensity levels from 0 to 255 (integer valued). Thus, a black pixel is encoded by 0 on all color channels; a white pixel by 255 on all color channels. A transparent pixel is encoded by 0 on the alpha channel; an opaque pixel by 255.
</para>
<para>
@@ -58,7 +56,7 @@
</para>
<para>
- With <guilabel>Scale</guilabel> option, you can determine whether the histogram will be displayed using a linear or logarithmic Y axis. For images taken with a digital camera, the <guilabel>Linear</guilabel> mode is usually the most useful. However, for images that contain substantial areas of constant color a <guilabel>Linear</guilabel> histogram will often be dominated by a single bar. In this case a <guilabel>Logarithmic</guilabel> histogram will be more useful.
+ With the <guilabel>Scale</guilabel> option you can determine whether the histogram will be displayed using a linear or logarithmic Y axis. For images taken with a digital camera, the <guilabel>Linear</guilabel> mode is usually the most useful. However, for images that contain substantial areas of constant color a <guilabel>Linear</guilabel> histogram will often be dominated by a single bar. In this case a <guilabel>Logarithmic</guilabel> histogram will be more useful.
</para>
<para>
@@ -138,7 +136,7 @@
</para></listitem>
<listitem><para>
- (2) : the middle-tone on the middle.
+ (2) : the middle-tone in the middle.
</para></listitem>
<listitem><para>
diff --git a/digikam/using-sidebar-intro.docbook b/digikam/using-sidebar-intro.docbook
index 737ec6a..dfaf896 100644
--- a/digikam/using-sidebar-intro.docbook
+++ b/digikam/using-sidebar-intro.docbook
@@ -2,7 +2,7 @@
<title>Introduction to the Right Sidebar</title>
<para>
- The &digikam; main window has a sidebar at the right border providing important information and actions of the selected images. This same sidebar is also available in the <guilabel>Image Editor</guilabel> view. It can be displayed by respectively clicking on one of the five tabs:
+ The &digikam; main window has a sidebar at the right border providing important information and actions of the selected images. This same sidebar is also available in the &digikam; Image Editor (except the <guilabel>Filters</guilabel> tab). It can be displayed by respectively clicking on one of the eight tabs:
</para>
<para>
@@ -25,11 +25,15 @@
</para></listitem>
<listitem><para>
- <link linkend="using-sidebar-captions">Captions</link> : Comments, Date & Time setting, Rating, Tags.
+ <link linkend="using-sidebar-captions">Captions</link> : Comments, Date & Time setting, Labels, Rating, Tags, selected metadata.
</para></listitem>
<listitem><para>
- <link linkend="using-sidebar-filters">Tag Filters</link> : Tag filters applied to main window selection.
+ <link linkend="using-sidebar-versions">Versions</link> : Image history.
+ </para></listitem>
+
+ <listitem><para>
+ <link linkend="using-sidebar-filters">Filters</link> : Filters to apply to main window selection.
</para></listitem>
<listitem><para>
diff --git a/digikam/using-sidebar-properties.docbook b/digikam/using-sidebar-properties.docbook
index 9709b7f..12f3296 100644
--- a/digikam/using-sidebar-properties.docbook
+++ b/digikam/using-sidebar-properties.docbook
@@ -3,12 +3,12 @@
<para>
- The properties sidebar shows the essential information about the selected image which are largely self-explanatory. It is grouped into the following sections:
+ The properties sidebar shows the essential informations about the selected image which are largely self-explanatory. It is grouped into the following sections:
<itemizedlist>
<listitem><para>
- File Properties: these are file system related information
+ File Properties: these are file system related informations
</para></listitem>
<listitem><para>
@@ -20,23 +20,19 @@
</para></listitem>
<listitem><para>
- &digikam; Properties: optional view to show a summary of the most important captions values set in &digikam; database.
+ &digikam; Properties: optional view to show a summary of the most important values set in &digikam; database.
</para></listitem>
</itemizedlist>
- <example>
-
- <title>Sidebar File Properties</title>
- <screenshot>
- <screeninfo>Sidebar File Properties Example</screeninfo>
- <mediaobject><imageobject>
- <imagedata fileref="&path;using-sidebar-properties.png" format="PNG" />
- </imageobject></mediaobject>
- </screenshot>
-
- </example>
+ </para>
+ <para>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="&path;using-sidebar-properties.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject>
</para>
</sect2>
diff --git a/digikam/using-sidebar-properties.png b/digikam/using-sidebar-properties.png
index 36f7136..da20671 100644
Binary files a/digikam/using-sidebar-properties.png and b/digikam/using-sidebar-properties.png differ
diff --git a/digikam/using-sidebar-tools.docbook b/digikam/using-sidebar-tools.docbook
index 4de4e08..3497d24 100644
--- a/digikam/using-sidebar-tools.docbook
+++ b/digikam/using-sidebar-tools.docbook
@@ -2,23 +2,21 @@
<title>Tools view</title>
<para>
- The tools view from right sidebar host the list of actions available to process actions on selection.
+ The tools view from right sidebar hosts the list of actions available to process actions on selection.
The list is an icon-view sorted by categories of tools. This view give a quick preview of all actions from main menu.
- For example, with image editor, you can adjust size current image with relevant crop tool.
+ For example, with the Image Editor, you can adjust the size of the current image with the relevant crop tool.
</para>
- <example>
-
- <title>Sidebar Tools View from Image Editor</title>
-
- <screenshot>
- <screeninfo>Sidebar Tools View from Image Editor</screeninfo>
- <mediaobject><imageobject>
- <imagedata fileref="&path;using-sidebar-tools.png" format="PNG" />
- </imageobject></mediaobject>
- </screenshot>
-
- </example>
+ <sect3 id="using-sidebar-tools-editor">
+ <title>Sidebar Tools of the Image Editor</title>
+ <para>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="&path;using-sidebar-tools.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject>
+ </para>
+ </sect3>
</sect2>
diff --git a/digikam/using-sidebar-versions-clist.png b/digikam/using-sidebar-versions-clist.png
new file mode 100644
index 0000000..e672ad3
Binary files /dev/null and b/digikam/using-sidebar-versions-clist.png differ
diff --git a/digikam/using-sidebar-versions-tree.png b/digikam/using-sidebar-versions-tree.png
new file mode 100644
index 0000000..dccd309
Binary files /dev/null and b/digikam/using-sidebar-versions-tree.png differ
diff --git a/digikam/using-sidebar.docbook b/digikam/using-sidebar.docbook
index fb6ede4..f607c9e 100644
--- a/digikam/using-sidebar.docbook
+++ b/digikam/using-sidebar.docbook
@@ -1,5 +1,5 @@
<sect1 id="using-sidebar">
- <title>&digikam; sidebar</title>
+ <title>The &digikam; Right Sidebar</title>
<anchor id="sidebar.anchor"/>
&doc-using-sidebar-intro;
@@ -8,6 +8,7 @@
&doc-using-sidebar-colors;
&doc-using-sidebar-maps;
&doc-using-sidebar-captions;
+ &doc-using-sidebar-versions;
&doc-using-sidebar-filters;
&doc-using-sidebar-tools;
diff --git a/showfoto/index.docbook b/showfoto/index.docbook
index aeb85bf..48e07de 100644
--- a/showfoto/index.docbook
+++ b/showfoto/index.docbook
@@ -20,6 +20,7 @@
<!ENTITY doc-using-sidebar-colors SYSTEM "../digikam/using-sidebar-colors.docbook">
<!ENTITY doc-using-sidebar-maps SYSTEM "../digikam/using-sidebar-maps.docbook">
<!ENTITY doc-using-sidebar-captions SYSTEM "../digikam/using-sidebar-captions.docbook">
+ <!ENTITY doc-using-sidebar-versions SYSTEM "../digikam/using-sidebar-versions.docbook">
<!ENTITY doc-using-sidebar-filters SYSTEM "../digikam/using-sidebar-filters.docbook">
<!ENTITY doc-using-sidebar-tools SYSTEM "../digikam/using-sidebar-tools.docbook">
@@ -29,6 +30,7 @@
<!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-version SYSTEM "../digikam/using-setup-editor-version.docbook">
<!ENTITY doc-using-setup-editor-raw SYSTEM "../digikam/using-setup-editor-raw.docbook">
<!ENTITY doc-using-setup-cm SYSTEM "../digikam/using-setup-cm.docbook">
<!ENTITY doc-using-setup-tooltip SYSTEM "../digikam/using-setup-tooltip.docbook">
@@ -271,6 +273,7 @@
&doc-using-setup-editor-iface;
&doc-using-setup-editor-save;
+ &doc-using-setup-editor-version;
&doc-using-setup-editor-raw;
</sect2>
More information about the kde-doc-english
mailing list