[gimp-help-2] Add uniform-transform.xml. Fixes in glossary.xml and contributing.xml



commit 53e0a440b4dba19a2a8a390985c6fe98e14e0031
Author: Julien Hardelin <jhardlin orange fr>
Date:   Wed Jun 7 07:43:25 2017 +0200

    Add uniform-transform.xml. Fixes in glossary.xml and contributing.xml

 images/C/contribute/guiicon.png                    |  Bin 0 -> 1148 bytes
 images/C/contribute/to-translators.png             |  Bin 0 -> 4454 bytes
 images/C/toolbox/perspective-from-pivot.png        |  Bin 0 -> 12564 bytes
 images/C/toolbox/perspective-icon.png              |  Bin 0 -> 2520 bytes
 images/C/toolbox/perspective-no-constraint.png     |  Bin 0 -> 16151 bytes
 images/C/toolbox/perspective-with-constraint.png   |  Bin 0 -> 13776 bytes
 images/C/toolbox/scale-from-pivot.png              |  Bin 0 -> 54198 bytes
 images/C/toolbox/scale-icon.png                    |  Bin 0 -> 2728 bytes
 images/C/toolbox/scale-no-constraint.png           |  Bin 0 -> 80530 bytes
 images/C/toolbox/scale-with-constraint.png         |  Bin 0 -> 101418 bytes
 images/C/toolbox/shear-icon.png                    |  Bin 0 -> 2859 bytes
 .../C/toolbox/stock-tool-unified-transform-22.png  |  Bin 0 -> 636 bytes
 .../C/toolbox/tool-options-unified-transform.png   |  Bin 0 -> 39462 bytes
 images/C/toolbox/tools-unified-transform.png       |  Bin 0 -> 173344 bytes
 images/C/toolbox/unified-transform-matrix.png      |  Bin 0 -> 24042 bytes
 .../toolbox/unified-transform-shear-from-pivot.png |  Bin 0 -> 115546 bytes
 images/C/toolbox/unified-transform.png             |  Bin 0 -> 173344 bytes
 src/appendix/contributing.xml                      |   24 +-
 src/glossary/glossary.xml                          |    2 +
 src/toolbox/transform-tools.xml                    |    3 +-
 src/toolbox/transform/unified-transform.xml        |  416 ++++++++++++++++++++
 21 files changed, 436 insertions(+), 9 deletions(-)
---
diff --git a/images/C/contribute/guiicon.png b/images/C/contribute/guiicon.png
new file mode 100644
index 0000000..39ca4a2
Binary files /dev/null and b/images/C/contribute/guiicon.png differ
diff --git a/images/C/contribute/to-translators.png b/images/C/contribute/to-translators.png
new file mode 100644
index 0000000..207fe7f
Binary files /dev/null and b/images/C/contribute/to-translators.png differ
diff --git a/images/C/toolbox/perspective-from-pivot.png b/images/C/toolbox/perspective-from-pivot.png
new file mode 100644
index 0000000..0282e82
Binary files /dev/null and b/images/C/toolbox/perspective-from-pivot.png differ
diff --git a/images/C/toolbox/perspective-icon.png b/images/C/toolbox/perspective-icon.png
new file mode 100644
index 0000000..2ac64fa
Binary files /dev/null and b/images/C/toolbox/perspective-icon.png differ
diff --git a/images/C/toolbox/perspective-no-constraint.png b/images/C/toolbox/perspective-no-constraint.png
new file mode 100644
index 0000000..f1954e2
Binary files /dev/null and b/images/C/toolbox/perspective-no-constraint.png differ
diff --git a/images/C/toolbox/perspective-with-constraint.png 
b/images/C/toolbox/perspective-with-constraint.png
new file mode 100644
index 0000000..c9ecce3
Binary files /dev/null and b/images/C/toolbox/perspective-with-constraint.png differ
diff --git a/images/C/toolbox/scale-from-pivot.png b/images/C/toolbox/scale-from-pivot.png
new file mode 100644
index 0000000..f685ce8
Binary files /dev/null and b/images/C/toolbox/scale-from-pivot.png differ
diff --git a/images/C/toolbox/scale-icon.png b/images/C/toolbox/scale-icon.png
new file mode 100644
index 0000000..b205d52
Binary files /dev/null and b/images/C/toolbox/scale-icon.png differ
diff --git a/images/C/toolbox/scale-no-constraint.png b/images/C/toolbox/scale-no-constraint.png
new file mode 100644
index 0000000..f2a0069
Binary files /dev/null and b/images/C/toolbox/scale-no-constraint.png differ
diff --git a/images/C/toolbox/scale-with-constraint.png b/images/C/toolbox/scale-with-constraint.png
new file mode 100644
index 0000000..ec3e37e
Binary files /dev/null and b/images/C/toolbox/scale-with-constraint.png differ
diff --git a/images/C/toolbox/shear-icon.png b/images/C/toolbox/shear-icon.png
new file mode 100644
index 0000000..170edd4
Binary files /dev/null and b/images/C/toolbox/shear-icon.png differ
diff --git a/images/C/toolbox/stock-tool-unified-transform-22.png 
b/images/C/toolbox/stock-tool-unified-transform-22.png
new file mode 100644
index 0000000..3f00493
Binary files /dev/null and b/images/C/toolbox/stock-tool-unified-transform-22.png differ
diff --git a/images/C/toolbox/tool-options-unified-transform.png 
b/images/C/toolbox/tool-options-unified-transform.png
new file mode 100644
index 0000000..830b620
Binary files /dev/null and b/images/C/toolbox/tool-options-unified-transform.png differ
diff --git a/images/C/toolbox/tools-unified-transform.png b/images/C/toolbox/tools-unified-transform.png
new file mode 100644
index 0000000..3cb15a8
Binary files /dev/null and b/images/C/toolbox/tools-unified-transform.png differ
diff --git a/images/C/toolbox/unified-transform-matrix.png b/images/C/toolbox/unified-transform-matrix.png
new file mode 100644
index 0000000..1da7107
Binary files /dev/null and b/images/C/toolbox/unified-transform-matrix.png differ
diff --git a/images/C/toolbox/unified-transform-shear-from-pivot.png 
b/images/C/toolbox/unified-transform-shear-from-pivot.png
new file mode 100644
index 0000000..b7eb1ae
Binary files /dev/null and b/images/C/toolbox/unified-transform-shear-from-pivot.png differ
diff --git a/images/C/toolbox/unified-transform.png b/images/C/toolbox/unified-transform.png
new file mode 100644
index 0000000..3cb15a8
Binary files /dev/null and b/images/C/toolbox/unified-transform.png differ
diff --git a/src/appendix/contributing.xml b/src/appendix/contributing.xml
index 077024a..003027c 100644
--- a/src/appendix/contributing.xml
+++ b/src/appendix/contributing.xml
@@ -3,6 +3,8 @@
                           "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 
 <appendix id="gimp-contributing">
+  <!--TO TRANSLATORS: No need to translate this document since only English 
+    knowing peoples can contribute-->
   <title>How to Contribute</title>
 
   <indexterm>
@@ -247,8 +249,12 @@
         Don't include English text in images. Translators can't translate it 
         and many users don't like that. Use XML captions instead, or provide a 
         .xcf file in the <guimenuitem>docs</guimenuitem> folder, indicating 
-        it by a comment in the XML file: "TRANSLATORS: there is a .xcf file for 
-        this image in the docs folder."
+        it by a comment in the XML file:
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/contribute/to-translators.png"/>
+          </imageobject>
+        </mediaobject>
       </para>
       
       <para>
@@ -256,12 +262,14 @@
         usr/share/gtk-doc/html/gtk2.
       </para>
       
-        <para>
-          To include an icon in the text:
-          <literallayout>
-            <guiicon><inlinegraphic fileref="path-to-icon"/></guiicon>
-          </literallayout>
-        </para>
+      <para>
+        To include an icon in the text:
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/contribute/guiicon.png"/>
+          </imageobject>
+        </mediaobject>
+      </para>
 
       <para>
         Three commands to manage your images:
diff --git a/src/glossary/glossary.xml b/src/glossary/glossary.xml
index 9bbf7fb..f77d669 100644
--- a/src/glossary/glossary.xml
+++ b/src/glossary/glossary.xml
@@ -270,6 +270,8 @@
         being perceptually uniform than it is to being linear.</para></listitem>
       </orderedlist>
 
+      <!--TO TRANSLATORS: a png file without text is in 
+https://git.gnome.org/browse/gimp-help-2/tree/docs folder-->
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/glossary/companding-curves-compared.png" format="PNG"/>
diff --git a/src/toolbox/transform-tools.xml b/src/toolbox/transform-tools.xml
index 254dcca..d91cfec 100644
--- a/src/toolbox/transform-tools.xml
+++ b/src/toolbox/transform-tools.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  050606 de introduced general options (tool-tranform) section by axel.wernicke
+  2017-05-06 j.h: add Unified transform
  -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tools-transform">
   <title>Transform Tools</title>
@@ -31,4 +31,5 @@
   <xi:include href="transform/perspective.xml"/>
   <xi:include href="transform/flip.xml"/>
   <xi:include href="transform/cage.xml"/>
+  <xi:include href="transform/unified-transform.xml"/>
 </sect1>
diff --git a/src/toolbox/transform/unified-transform.xml b/src/toolbox/transform/unified-transform.xml
new file mode 100644
index 0000000..388bdd5
--- /dev/null
+++ b/src/toolbox/transform/unified-transform.xml
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!-- section history:
+  2017-06-01 j.h: created
+ -->
+
+<sect2 id="gimp-tool-unified-transform">
+  <title>Unified Transform</title>
+
+  <indexterm>
+    <primary>Tools</primary>
+    <secondary>Unified Transform></secondary>
+  </indexterm>
+  <indexterm><primary>Unified Transform></primary></indexterm>
+
+  <figure>
+    <title>Unified Transform tool</title>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata format="PNG"
+          fileref="images/toolbox/unified-transform.png"/>
+      </imageobject>
+    </mediaobject>
+  </figure>
+
+  <para>
+    This tool combines several tools: <link 
+    linkend="gimp-tool-rotate">Rotate</link>, <link 
+    linkend="gimp-tool-scale">Scale</link>, <link 
+    linkend="gimp-tool-shear">Shear</link> and <link 
+    linkend="gimp-tool-perspective">Perspective</link>, performing one or 
+    several of these actions at once in one single operation.
+    Combining two or more options gives you almost infinite possibilities of 
+    transformation.
+  </para>
+  <para>
+    As the other transformation tools, this tool works on the active layer 
+    (default).
+  </para>
+  <para>
+    After selecting the Unified Transform tool in the toolbox, click on the 
+    image window. Several elements appear on the image window:
+    <itemizedlist>
+      <listitem>
+        <para>
+          Several kinds of <emphasis role="bold">handles</emphasis>, on 
+          the edges:
+          <itemizedlist>
+            <listitem>
+              <para>
+                <guiicon><inlinegraphic 
+                  fileref="images/toolbox/shear-icon.png"/></guiicon>
+                Diamonds for shearing
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <guiicon><inlinegraphic 
+                  fileref="images/toolbox/scale-icon.png"/></guiicon>
+                Squares for scaling.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <guiicon><inlinegraphic 
+                  fileref="images/toolbox/perspective-icon.png"/></guiicon>
+                Small diamonds for changing perspective, in large squares for 
+                Scaling.
+              </para>
+            </listitem>
+          </itemizedlist>
+          Click and drag a handle to perform the action of the concerned tool
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          A <emphasis role="bold">circle with a cross inside</emphasis> at 
+          the center of the image window for the pivot. Click and 
+          drag this circle to move the pivot. It can be placed out 
+          of the image window, and even where you want on screen (but you can 
+          no longer see it, unless you enlarge the image window).
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <emphasis role="bold">mouse pointer</emphasis> comes with small 
+          icons which vary according to position:
+          <itemizedlist>
+            <listitem>
+              <para>
+                <emphasis>On the layer</emphasis>: Move icon,
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <emphasis>Outside the layer</emphasis>: Rotate icon,
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <emphasis>On handles</emphasis>: Shear or perspective or Scale 
+                icon,
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <emphasis>On rotation center circle</emphasis>: Move icon and 
+                Rotation icon.
+              </para>
+            </listitem>
+          </itemizedlist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <emphasis role="bold">status bar</emphasis>, at the bottom of 
+          the image window, displays the name of the current tool.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          When you click on the image window, also appears the 
+          <emphasis role="bold">Matrix</emphasis> new window:
+          <mediaobject>
+              <imageobject>
+              <imagedata format="PNG"
+                fileref="images/toolbox/unified-transform-matrix.png"/>
+            </imageobject>
+          </mediaobject>
+          where you find the <guilabel>Reset</guilabel> (very useful when 
+          testing), <guilabel>Cancel</guilabel> and 
+          <guilabel>Transform</guilabel> buttons. This matrix window appears 
+          out of the image or, if the image window is large enough, inside the 
+          image window. You cannot edit the values of this matrix, but you can 
+          note them to reproduce the same transformation later.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </para>
+
+  <sect3>
+    <title>
+      <phrase>Activating the Tool</phrase>
+    </title>
+
+    <para>
+      There are different possibilities to activate the tool:
+    </para>
+
+    <itemizedlist>
+      <listitem>
+        <para>
+          From the image-menu:
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Transform Tools</guisubmenu>
+            <guimenuitem>Unified transform</guimenuitem>
+          </menuchoice>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The Tool can also be called by clicking the tool icon:
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata 
+                fileref="images/toolbox/stock-tool-unified-transform-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          or by clicking on the 
+          <keycombo><keycap>Shift</keycap><keycap>L</keycap></keycombo> 
+          keyboard shortcut.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect3>
+
+
+  <sect3>
+    <title>Options</title>
+    <figure>
+      <title>Unified Transform Tool Options</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-unified-transform.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      The available tool options can be accessed by double clicking the
+      Unified Transform tool icon.
+      <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata 
+                fileref="images/toolbox/stock-tool-unified-transform-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
+    </para>
+
+    <variablelist>
+      <varlistentry>
+        <term role="big">Shared options</term>
+        <listitem>
+          <note>
+            <para>
+              See <xref linkend="gimp-tool-transform" /> for a description of 
+              tool options that apply to many or all transform tools.
+            </para>
+          </note>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term role="big">Constrain</term>
+        <listitem>
+          <para>
+            <guilabel>Move</guilabel>: when this option is unchecked, moving 
+            the layer is smooth. Checking the option constrains movement to 45° 
+            from center. 
+          </para>
+          <para>
+            <guilabel>Scale</guilabel>: when this option is checked, the aspect 
+            ratio is preserved.
+            <figure>
+              <title>Scale Constraint Option</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                    fileref="images/toolbox/scale-no-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    Constrain not checked (no pivot)
+                  </para>
+                </caption>
+              </mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                    fileref="images/toolbox/scale-with-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    Constrain checked (no pivot)
+                  </para>
+                </caption>
+              </mediaobject>
+            </figure>
+          </para>
+          <para>
+            <guilabel>Rotate</guilabel>: default rotation is smooth. When this 
+            option is checked, rotation goes by 15° steps.
+          </para>
+          <para>
+            <guilabel>Shear</guilabel>: normally, to shear the layer, 
+            you drag the corresponding icon along a layer edge. If this option 
+            is unchecked (default), you may move away from this edge. If this 
+            option is checked, shear handles remain on this edge.
+          </para>
+          <para>
+            <guilabel>Perspective</guilabel>: normally, to change perspective, 
+            you drag the corresponding icon along a layer edge. If this option 
+            is unchecked (default), you may move away from this edge. If this 
+            option is checked, shear handles remain on this edge or on a 
+            diagonal.
+            <figure>
+              <title>Perspective Constraint Option</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                    fileref="images/toolbox/perspective-no-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    Constrain not checked
+                  </para>
+                </caption>
+              </mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                    fileref="images/toolbox/perspective-with-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    Constrain checked
+                  </para>
+                </caption>
+              </mediaobject>
+            </figure>            
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term role="big">From pivot</term>
+        <listitem>
+          <para>
+            <guilabel>Scale</guilabel>: 
+            <figure>
+              <title>Scale from pivot</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                  fileref="images/toolbox/scale-with-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    From pivot not checked, constrain checked
+                  </para>
+                </caption>
+              </mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                fileref="images/toolbox/scale-from-pivot.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    From pivot and constrain checked
+                  </para>
+                </caption>
+              </mediaobject>
+            </figure>
+          </para>
+          <para>
+            <guilabel>Shear</guilabel>: 
+            When this option is unchecked, the opposite edge is fixed 
+            and the pivot moves with shearing. When the option 
+            is checked, shearing is performed around a fixed pivot and the 
+            opposite side is sheared by the same amount.           
+          </para>
+          <para>
+            <guilabel>Perspective</guilabel>: when this option is checked, the 
+            position of pivot is maintained.
+            <figure>
+              <title>Perspective from pivot</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                  fileref="images/toolbox/perspective-with-constraint.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    From pivot not checked, constrain checked
+                  </para>
+                </caption>
+              </mediaobject>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                  fileref="images/toolbox/perspective-from-pivot.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    From pivot and constrain checked
+                  </para>
+                </caption>
+              </mediaobject>
+            </figure>
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Pivot</term>
+        <listitem>
+          <para>
+            <guilabel>Snap</guilabel>: if this option is checked, the 
+            pivot snaps to center or to corners when it comes close to them.
+          </para>
+          <para>
+            <guilabel>Lock</guilabel>: locks pivot.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect3>
+  
+  <sect3>
+    <title>Key modifiers</title>
+    <para>
+      Key modifiers are active when an action (move, scale, rotate...) is 
+      selected. Hold on:
+      <itemizedlist>
+        <listitem>
+          <para>
+            <keycap>Shift</keycap> to check all Constrain unchecked options 
+            and uncheck already checked ones if a transformation handle is 
+            selected, or, if the pivot is selected, to snap pivot to center or 
+            corner,
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <keycap>Ctrl</keycap> to check all From pivot unchecked options 
+            and uncheck already checked ones.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+  </sect3>
+
+</sect2>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]