GNOME.org
 

[gimp-help] Transform tools updated. Fix issues #44, #45, #65, #84

commit cc8a5ef2083e3fe5eeffc6030722b545d8622d85
Author: Julien Hardelin <jhardlin orange fr>
Date:   Fri Oct 26 16:47:19 2018 +0200

    Transform tools updated. Fix issues #44, #45, #65, #84

 .../{tool-options-cage.png => cage-dialog.png}     | Bin
 .../toolbox/{toolbox-cage.png => cage-toolbox.png} | Bin
 .../{tool-options-crop.png => crop-dialog.png}     | Bin
 images/C/toolbox/flip-dialog.png                   | Bin 0 -> 8589 bytes
 ...orm-options.png => handle-transform-dialog.png} | Bin
 .../{tool-options-move.png => move-dialog.png}     | Bin
 ...ions-perspective.png => perspective-dialog.png} | Bin
 images/C/toolbox/perspective-no-preview.jpg        | Bin 0 -> 71779 bytes
 images/C/toolbox/perspective-orig.jpg              | Bin 0 -> 50511 bytes
 images/C/toolbox/perspective-with-preview.jpg      | Bin 0 -> 75250 bytes
 .../{tool-options-rotate.png => rotate-dialog.png} | Bin
 images/C/toolbox/scale-dialog.png                  | Bin 0 -> 19807 bytes
 .../{tool-options-shear.png => shear-dialog.png}   | Bin
 images/C/toolbox/tool-options-flip.png             | Bin 7620 -> 0 bytes
 images/C/toolbox/tool-options-scale.png            | Bin 22381 -> 0 bytes
 ...-transform.png => unified-transform-dialog.png} | Bin
 .../{warp-dialog-options.png => warp-dialog.png}   | Bin
 src/toolbox/transform-tools.xml                    |   5 +-
 src/toolbox/transform/cage.xml                     |   4 +-
 src/toolbox/transform/common-features.xml          |   2 +-
 src/toolbox/transform/crop.xml                     |  16 ++----
 src/toolbox/transform/flip.xml                     |  23 ++++----
 src/toolbox/transform/handle-transform.xml         |   2 +-
 src/toolbox/transform/move.xml                     |   4 +-
 src/toolbox/transform/perspective.xml              |  58 +++++++++++++++++----
 src/toolbox/transform/rotate.xml                   |  11 +---
 src/toolbox/transform/scale.xml                    |   6 ++-
 src/toolbox/transform/shear.xml                    |  12 ++---
 src/toolbox/transform/unified-transform.xml        |  14 ++---
 src/toolbox/transform/warp-transform.xml           |   2 +-
 30 files changed, 90 insertions(+), 69 deletions(-)
---
diff --git a/images/C/toolbox/tool-options-cage.png b/images/C/toolbox/cage-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-cage.png
rename to images/C/toolbox/cage-dialog.png
diff --git a/images/C/toolbox/toolbox-cage.png b/images/C/toolbox/cage-toolbox.png
similarity index 100%
rename from images/C/toolbox/toolbox-cage.png
rename to images/C/toolbox/cage-toolbox.png
diff --git a/images/C/toolbox/tool-options-crop.png b/images/C/toolbox/crop-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-crop.png
rename to images/C/toolbox/crop-dialog.png
diff --git a/images/C/toolbox/flip-dialog.png b/images/C/toolbox/flip-dialog.png
new file mode 100644
index 000000000..7b994c773
Binary files /dev/null and b/images/C/toolbox/flip-dialog.png differ
diff --git a/images/C/toolbox/handle-transform-options.png b/images/C/toolbox/handle-transform-dialog.png
similarity index 100%
rename from images/C/toolbox/handle-transform-options.png
rename to images/C/toolbox/handle-transform-dialog.png
diff --git a/images/C/toolbox/tool-options-move.png b/images/C/toolbox/move-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-move.png
rename to images/C/toolbox/move-dialog.png
diff --git a/images/C/toolbox/tool-options-perspective.png b/images/C/toolbox/perspective-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-perspective.png
rename to images/C/toolbox/perspective-dialog.png
diff --git a/images/C/toolbox/perspective-no-preview.jpg b/images/C/toolbox/perspective-no-preview.jpg
new file mode 100644
index 000000000..480a1de14
Binary files /dev/null and b/images/C/toolbox/perspective-no-preview.jpg differ
diff --git a/images/C/toolbox/perspective-orig.jpg b/images/C/toolbox/perspective-orig.jpg
new file mode 100644
index 000000000..7d5a59340
Binary files /dev/null and b/images/C/toolbox/perspective-orig.jpg differ
diff --git a/images/C/toolbox/perspective-with-preview.jpg b/images/C/toolbox/perspective-with-preview.jpg
new file mode 100644
index 000000000..81e882724
Binary files /dev/null and b/images/C/toolbox/perspective-with-preview.jpg differ
diff --git a/images/C/toolbox/tool-options-rotate.png b/images/C/toolbox/rotate-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-rotate.png
rename to images/C/toolbox/rotate-dialog.png
diff --git a/images/C/toolbox/scale-dialog.png b/images/C/toolbox/scale-dialog.png
new file mode 100644
index 000000000..f8b687238
Binary files /dev/null and b/images/C/toolbox/scale-dialog.png differ
diff --git a/images/C/toolbox/tool-options-shear.png b/images/C/toolbox/shear-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-shear.png
rename to images/C/toolbox/shear-dialog.png
diff --git a/images/C/toolbox/tool-options-unified-transform.png 
b/images/C/toolbox/unified-transform-dialog.png
similarity index 100%
rename from images/C/toolbox/tool-options-unified-transform.png
rename to images/C/toolbox/unified-transform-dialog.png
diff --git a/images/C/toolbox/warp-dialog-options.png b/images/C/toolbox/warp-dialog.png
similarity index 100%
rename from images/C/toolbox/warp-dialog-options.png
rename to images/C/toolbox/warp-dialog.png
diff --git a/src/toolbox/transform-tools.xml b/src/toolbox/transform-tools.xml
index 4819b1fd6..f1107bd2a 100644
--- a/src/toolbox/transform-tools.xml
+++ b/src/toolbox/transform-tools.xml
@@ -31,9 +31,10 @@
   <xi:include href="transform/scale.xml"/>
   <xi:include href="transform/shear.xml"/>
   <xi:include href="transform/perspective.xml"/>
+  <xi:include href="transform/unified-transform.xml"/>
+  <xi:include href="transform/handle-transform.xml"/>
   <xi:include href="transform/flip.xml"/>
   <xi:include href="transform/cage.xml"/>
-  <xi:include href="transform/unified-transform.xml"/>
   <xi:include href="transform/warp-transform.xml"/>
-  <xi:include href="transform/handle-transform.xml"/>
+  
 </sect1>
diff --git a/src/toolbox/transform/cage.xml b/src/toolbox/transform/cage.xml
index 4157396e6..2c3bfc295 100755
--- a/src/toolbox/transform/cage.xml
+++ b/src/toolbox/transform/cage.xml
@@ -16,7 +16,7 @@
     <mediaobject>
       <imageobject>
         <imagedata format="PNG"
-          fileref="images/toolbox/toolbox-cage.png"/>
+          fileref="images/toolbox/cage-toolbox.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -77,7 +77,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/tool-options-cage.png"/>
+            fileref="images/toolbox/cage-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/transform/common-features.xml b/src/toolbox/transform/common-features.xml
index 2647cd873..85b43bc55 100644
--- a/src/toolbox/transform/common-features.xml
+++ b/src/toolbox/transform/common-features.xml
@@ -480,7 +480,7 @@
       </varlistentry>
     </variablelist>
   </sect3>
-  <sect3>
+  <sect3 id="transform-path">
     <title>Transforming Paths</title>
     <indexterm>
       <primary>Transform</primary>
diff --git a/src/toolbox/transform/crop.xml b/src/toolbox/transform/crop.xml
index ec1f59fe6..0a0aaaec6 100644
--- a/src/toolbox/transform/crop.xml
+++ b/src/toolbox/transform/crop.xml
@@ -4,15 +4,7 @@
 <!-- section history:
   2009-03-14 j.h: rebuilt the Allow Growing example
   2008-03-01 j.h: rewrote Shrink Merged. Added "arrow keys"
-  2008-01-18 ude: updated 'de'
-  2008-01-11 j.h: updated to v2.4 'en;fr'
-  2007-06-11 kost: added 'no'
-  2007-04-18 Added Spanish translation by AntI
-  2007-05-13 lexa: enhanced docbook compliance
-  2006-02-06 en;fr revised by j.h
-  2005-12-07 replaced <simplesect> by <sect3> by lexa
-  2005-12-01 informalfigure replaced by figure by lexa
-  0506609 de reviewed by axel.wernicke
+  
   -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-crop">
   <title>Crop</title>
@@ -73,15 +65,12 @@
   <note>
     <para>
       You can see the aspect ratio in the status bar:
-<!--      <figure>
-        <title>Aspect ratio display</title>-->
         <mediaobject>
           <imageobject>
             <imagedata format="PNG"
                        fileref="images/toolbox/display_ratio.png"/>
           </imageobject>
         </mediaobject>
-<!--      </figure>-->
     </para>
   </note>
 
@@ -148,7 +137,8 @@
       <title>Tool Options for the <quote>Crop</quote> tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-crop.png" format="PNG"/>
+          <imagedata fileref="images/toolbox/crop-dialog.png" 
+format="PNG"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/transform/flip.xml b/src/toolbox/transform/flip.xml
index fdc513d08..8baf3661d 100644
--- a/src/toolbox/transform/flip.xml
+++ b/src/toolbox/transform/flip.xml
@@ -1,15 +1,7 @@
 <?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:
-  2009-03-15 j.h: reviewed for v2.6. No change
-  2008-01-14 j.h: no change for v2.4
-  2007-06-13 kost: added 'no'
-  2007-05-20 lexa: enhanced docbook compliance
-  2007-04-20 Added Spanish translation by AntI
-  2006-02-10 some more precisions on tool action en;fr by j.h
-  2005-12-07 replaced <simplesect> by <sect3> by lexa
-  2005-12-01 informalfigure replaced by figure by lexa
-  050806 de reviewed by axel.wernicke
+  2018-10-25 j.h Update to v2.10
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-flip">
   <title>Flip</title>
@@ -91,7 +83,8 @@
       <title><quote>Flip Tool</quote> Options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-flip.png" format="PNG"/>
+          <imagedata fileref="images/toolbox/flip-dialog.png" 
+format="PNG"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -110,11 +103,17 @@
         <listitem>
           <para>
             The Tool Toggle settings control flipping in either a Horizontal
-            or Vertical direction. This toggle can also be switched using a
-            key modifier.
+            or Vertical direction. This toggle can also be switched using 
+            <keycap>Ctrl</keycap>.
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>Clipping</term>
+        <listitem>
+          <xi:include href="about-common-transform-options.xml"/>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </sect3>
 </sect2>
diff --git a/src/toolbox/transform/handle-transform.xml b/src/toolbox/transform/handle-transform.xml
index 5097a113c..e44260929 100644
--- a/src/toolbox/transform/handle-transform.xml
+++ b/src/toolbox/transform/handle-transform.xml
@@ -183,7 +183,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/handle-transform-options.png"/>
+            fileref="images/toolbox/handle-transform-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/transform/move.xml b/src/toolbox/transform/move.xml
index dfe48c2bc..03fbcf34a 100644
--- a/src/toolbox/transform/move.xml
+++ b/src/toolbox/transform/move.xml
@@ -70,7 +70,7 @@
             Holding down the <keycap>Space</keycap> bar changes the active
             tool to Move temporarily. The Move tool remains active as long as
             the space bar is held down. The original tool is reactivated
-            after releasing the space bar. This behaviour exists only if the
+            after releasing the space bar. This behavior exists only if the
             <guilabel>Switch to Move tool</guilabel> option is
             enabled in
             <menuchoice>
@@ -91,7 +91,7 @@
       <title>Move Tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-move.png"
+          <imagedata fileref="images/toolbox/move-dialog.png"
             format="PNG"/>
         </imageobject>
       </mediaobject>
diff --git a/src/toolbox/transform/perspective.xml b/src/toolbox/transform/perspective.xml
index 2bb6409bb..7ed05a19e 100644
--- a/src/toolbox/transform/perspective.xml
+++ b/src/toolbox/transform/perspective.xml
@@ -2,14 +2,8 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  2008-01-13 j.h: updated 'en;fr' to v2.4
-  2007-06-13 kost: added 'no'
-  2007-05-06 lexa: revised en and de and enhanced docbook compliance
-  2007-04-22 Added Spanish translation by AntI
-  2006-06-14 changes in Affect section
-  2005-12-06 replaced sect3 by sect3 by lexa
-  2005-12-06 replaced informalfigure by figure by lexa
-  050806 de reviewed by axel.wernicke
+  2018-10-24 j.h: fix issue #65 (view preview in gimp-2.10)
+
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-perspective">
   <title>Perspective</title>
@@ -90,7 +84,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/tool-options-perspective.png"/>
+            fileref="images/toolbox/perspective-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -139,4 +133,50 @@
       </varlistentry>
     </variablelist>
   </sect3>
+  
+  <sect3>
+    <title>View preview</title>
+    <para>
+      The Perspective tool is mostly used to correct perspective distortion in 
+      photographs. Then the Corrective option is used. In GIMP-2.10, this 
+      option got the possibility of showing preview. The transformation result 
+      may not be as good as without preview.
+      <figure>
+        <title>
+          Original image
+        </title>
+        <mediaobject>
+          <imageobject>
+            <imagedata format="JPG"
+              fileref="images/toolbox/perspective-orig.jpg"/>
+          </imageobject>
+        </mediaobject>
+      </figure>
+      <figure>
+        <title>Without and with preview</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata format="JPG"
+              fileref="images/toolbox/perspective-no-preview.jpg"/>
+          </imageobject>
+          <caption>
+            <para>
+              <quote>View preview</quote> unchecked
+            </para>
+          </caption>
+        </mediaobject>
+        <mediaobject>
+          <imageobject>
+            <imagedata format="JPG"
+              fileref="images/toolbox/perspective-with-preview.jpg"/>
+          </imageobject>
+          <caption>
+            <para>
+              Same transformation.<quote>View preview</quote> checked.
+            </para>
+          </caption>
+        </mediaobject>
+      </figure>
+    </para>
+  </sect3>
 </sect2>
diff --git a/src/toolbox/transform/rotate.xml b/src/toolbox/transform/rotate.xml
index 17628eeb4..d61832603 100644
--- a/src/toolbox/transform/rotate.xml
+++ b/src/toolbox/transform/rotate.xml
@@ -4,14 +4,7 @@
 <!-- section history:
   2009-03-14 j.h: revised for v2.6
   2008-01-13 j.h: updated to v2.4
-  2007-06-13 kost: added no
-  2007-04-20 Added Spanish translation by AntI
-  2007-04-10 lexa: enhanced docbook compliance
-  2006-02-18 en;fr revised by j.h  Added  rotate dialog
-  2005-12-06 replaced simplesect by sect3 by lexa
-  2005-12-06 replaced informalfigure by figure by lexa
-  050529 de added content for rotate dialog
-  050529 de reviewed by axel.wernicke
+  
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-rotate">
   <title>Rotate</title>
@@ -103,7 +96,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-                     fileref="images/toolbox/tool-options-rotate.png"/>
+                     fileref="images/toolbox/rotate-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/transform/scale.xml b/src/toolbox/transform/scale.xml
index 0c46fa56c..4841bfe97 100644
--- a/src/toolbox/transform/scale.xml
+++ b/src/toolbox/transform/scale.xml
@@ -126,7 +126,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/tool-options-scale.png"/>
+            fileref="images/toolbox/scale-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -147,6 +147,10 @@
               <link linkend="gimp-image-scale">Scale Image</link>.
             </para>
           </note>
+          <para>
+            To scale a path, please refer to 
+            <link linkend="transform-path">Transforming path</link>.
+          </para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/src/toolbox/transform/shear.xml b/src/toolbox/transform/shear.xml
index 99846497d..450d9474c 100644
--- a/src/toolbox/transform/shear.xml
+++ b/src/toolbox/transform/shear.xml
@@ -4,12 +4,6 @@
 <!-- section history:
   2009-03-15 j.h: reviewed for v2.6. No change
   2008-01-06 j.h: updated to v2.4. Added example
-  2007-06-14 kost: added norwegian
-  2007-04-22 Added Spanish translation by AntI
-  2006-06-16 Preview section modified en;fr by j.h
-  2005-12-06 replaced simplesect by sect3 by lexa
-  2005-12-06 replaced informalfigure by figure by lexa
-  050606 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-shear">
   <title>Shear</title>
@@ -35,7 +29,7 @@
     instance, a horizontal shearing will shift the upper part to the right and
     the lower part to the left. A rectangle becomes a diamond. This is not a
     rotation: the image is distorted. To use this tool after selecting, click
-    on the image or the selection: a grid is possibly surperimposed and the
+    on the image or the selection: a grid is possibly superimposed and the
     Shearing Information dialog is opened. By dragging the mouse pointer on
     the image you distort the image, horizontally or vertically according to
     the direction given to the pointer. When you are satisfied, click on
@@ -100,7 +94,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-                     fileref="images/toolbox/tool-options-shear.png"/>
+                     fileref="images/toolbox/shear-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -110,7 +104,7 @@
     <variablelist>
       <varlistentry>
         <term>
-          Transform Direction; Interpolation; Clippping; Preview; Guides
+          Transform Direction; Interpolation; Clipping; Preview; Guides
         </term>
         <listitem>
           <xi:include href="about-common-transform-options.xml"/>
diff --git a/src/toolbox/transform/unified-transform.xml b/src/toolbox/transform/unified-transform.xml
index 4bdfae657..2cbb04a9f 100644
--- a/src/toolbox/transform/unified-transform.xml
+++ b/src/toolbox/transform/unified-transform.xml
@@ -193,7 +193,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/tool-options-unified-transform.png"/>
+            fileref="images/toolbox/unified-transform-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -230,7 +230,7 @@
           <para>
             <guilabel>Move</guilabel>: when this option is unchecked, moving 
             the layer is smooth. Checking the option constrains movement to 45° 
-            from center. 
+            from center.
           </para>
           <para>
             <guilabel>Scale</guilabel>: when this option is checked, the aspect 
@@ -301,7 +301,7 @@
                   </para>
                 </caption>
               </mediaobject>
-            </figure>            
+            </figure>
           </para>
         </listitem>
       </varlistentry>
@@ -341,8 +341,8 @@
             When this option is unchecked (default), 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, but in the opposite
-           direction.
+            opposite side is sheared by the same amount, but in the opposite 
+            direction.
           </para>
           <para>
             <guilabel>Perspective</guilabel>: when this option is checked, the 
@@ -406,8 +406,8 @@
         </listitem>
         <listitem>
           <para>
-            <keycap>Ctrl</keycap> to check all From pivot unchecked options 
-            and uncheck already checked ones.
+            <keycap>Ctrl</keycap> to check all <quote>From pivot</quote> 
+            unchecked options and uncheck already checked ones.
           </para>
         </listitem>
       </itemizedlist>
diff --git a/src/toolbox/transform/warp-transform.xml b/src/toolbox/transform/warp-transform.xml
index 6fdde9b69..5d589fbcb 100644
--- a/src/toolbox/transform/warp-transform.xml
+++ b/src/toolbox/transform/warp-transform.xml
@@ -78,7 +78,7 @@
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/warp-dialog-options.png"/>
+            fileref="images/toolbox/warp-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]