[gimp-help-2] Group toolbox description

From: Ulf-D. Ehlert <ulfehlert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp-help-2] Group toolbox description
Date: Sun, 18 Apr 2010 18:10:46 +0000 (UTC)
commit 80146060a36307d02c76ba661b999d19296a0542
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Sun Apr 18 18:34:21 2010 +0200

    Group toolbox description
    
    After renaming "Toolbox" to "Tools" (commit 46ec6f09 2010-03-13) the
    description of the toolbox (icons, color & indicator area, tool options)
    should be grouped together.
    Also, add new toolbox screenshots (GIMP-2.6.7, GTK-2.18, GNOME-2.28);
    remove XDS dialog (comment out for now); minor changes to XML source.

 images/C/toolbox/toolbox-active-bpg.png            |  Bin 0 -> 4155 bytes
 images/C/toolbox/toolbox-active-colors.png         |  Bin 0 -> 4018 bytes
 images/C/toolbox/toolbox-active-image.png          |  Bin 0 -> 3712 bytes
 images/C/toolbox/toolbox-bpg.png                   |  Bin 9755 -> 0 bytes
 images/C/toolbox/toolbox-icons.png                 |  Bin 0 -> 38242 bytes
 images/C/toolbox/toolbox-image.png                 |  Bin 9749 -> 0 bytes
 images/C/toolbox/toolbox-palette.png               |  Bin 9760 -> 0 bytes
 images/C/toolbox/toolbox-show-area.png             |  Bin 0 -> 7393 bytes
 images/C/toolbox/toolbox-tool-options.png          |  Bin 0 -> 16584 bytes
 .../{toolbox-bpg.png => toolbox-active-bpg.png}    |  Bin 11937 -> 11937 bytes
 ...olbox-palette.png => toolbox-active-colors.png} |  Bin 11929 -> 11929 bytes
 ...{toolbox-image.png => toolbox-active-image.png} |  Bin 11929 -> 11929 bytes
 src/gimp.xml                                       |    1 -
 src/toolbox/intro.xml                              |  197 +++++++++++++-------
 src/toolbox/path.xml                               |    2 +-
 src/toolbox/toolbox-color-area.xml                 |   48 ++++--
 src/using/layers.xml                               |    2 +-
 17 files changed, 159 insertions(+), 91 deletions(-)
---
diff --git a/images/C/toolbox/toolbox-active-bpg.png b/images/C/toolbox/toolbox-active-bpg.png
new file mode 100644
index 0000000..b998228
Binary files /dev/null and b/images/C/toolbox/toolbox-active-bpg.png differ
diff --git a/images/C/toolbox/toolbox-active-colors.png b/images/C/toolbox/toolbox-active-colors.png
new file mode 100644
index 0000000..ea03732
Binary files /dev/null and b/images/C/toolbox/toolbox-active-colors.png differ
diff --git a/images/C/toolbox/toolbox-active-image.png b/images/C/toolbox/toolbox-active-image.png
new file mode 100644
index 0000000..53ce3d0
Binary files /dev/null and b/images/C/toolbox/toolbox-active-image.png differ
diff --git a/images/C/toolbox/toolbox-icons.png b/images/C/toolbox/toolbox-icons.png
new file mode 100644
index 0000000..d0fccd6
Binary files /dev/null and b/images/C/toolbox/toolbox-icons.png differ
diff --git a/images/C/toolbox/toolbox-show-area.png b/images/C/toolbox/toolbox-show-area.png
new file mode 100644
index 0000000..34d9829
Binary files /dev/null and b/images/C/toolbox/toolbox-show-area.png differ
diff --git a/images/C/toolbox/toolbox-tool-options.png b/images/C/toolbox/toolbox-tool-options.png
new file mode 100644
index 0000000..d7fdd33
Binary files /dev/null and b/images/C/toolbox/toolbox-tool-options.png differ
diff --git a/images/ru/toolbox/toolbox-bpg.png b/images/ru/toolbox/toolbox-active-bpg.png
similarity index 100%
rename from images/ru/toolbox/toolbox-bpg.png
rename to images/ru/toolbox/toolbox-active-bpg.png
diff --git a/images/ru/toolbox/toolbox-palette.png b/images/ru/toolbox/toolbox-active-colors.png
similarity index 100%
rename from images/ru/toolbox/toolbox-palette.png
rename to images/ru/toolbox/toolbox-active-colors.png
diff --git a/images/ru/toolbox/toolbox-image.png b/images/ru/toolbox/toolbox-active-image.png
similarity index 100%
rename from images/ru/toolbox/toolbox-image.png
rename to images/ru/toolbox/toolbox-active-image.png
diff --git a/src/gimp.xml b/src/gimp.xml
index 2c15088..2bf6799 100644
--- a/src/gimp.xml
+++ b/src/gimp.xml
@@ -159,7 +159,6 @@
       <xi:include href="toolbox/transform-tools.xml"/>
       <xi:include href="toolbox/color-tools.xml"/>
       <xi:include href="toolbox/other-tools.xml"/>
-      <xi:include href="toolbox/toolbox-color-area.xml"/>
     </chapter>
     <chapter id="dialogs">
       <title>Dialogs</title>
diff --git a/src/toolbox/intro.xml b/src/toolbox/intro.xml
index f121770..59c9589 100644
--- a/src/toolbox/intro.xml
+++ b/src/toolbox/intro.xml
@@ -10,95 +10,148 @@
   2005-11-26 fixed images and tips structure by romanofski
   2005-05-15 de reviewed by axel.wernicke
 -->
-<sect1 id="gimp-toolbox">
+<sect1 id="gimp-toolbox" xmlns:xi="http://www.w3.org/2001/XInclude";>
   <title>The Toolbox</title>
-  <anchor id="gimp-toolbox-introduction"/>
 
   <indexterm>
     <primary>Toolbox</primary>
   </indexterm>
 
-  <para>
-    <acronym>GIMP</acronym> provides a comprehensive toolbox in order to
-    quickly perform basic tasks such as making selections or drawing paths.
-    The many tools contained within <acronym>GIMP</acronym>'s toolbox are
-    discussed in detail here.
-  </para>
-  <para>
-    (In case you're curious, in <acronym>GIMP</acronym> lingo a "tool" is a
-    way of acting on an image that requires access to its display, either to
-    let you indicate what you want to do by moving the pointer around inside
-    the display, or to show you interactively the results of changes that you
-    have made. But if you want to think of a tool as a saw, and an image as a
-    piece of wood, it probably won't do you a great deal of harm.)
-  </para>
-  <note>
+  <sect2 id="gimp-toolbox-introduction">
+    <title>Introduction</title>
+
+    <para>
+      <acronym>GIMP</acronym> provides a comprehensive toolbox in order to
+      quickly perform basic tasks such as making selections or drawing paths.
+      The many tools contained within <acronym>GIMP</acronym>'s toolbox are
+      discussed in detail here.
+    </para>
+    <para>
+      (In case you're curious, in <acronym>GIMP</acronym> lingo a "tool" is a
+      way of acting on an image that requires access to its display, either to
+      let you indicate what you want to do by moving the pointer around inside
+      the display, or to show you interactively the results of changes that
+      you have made. But if you want to think of a tool as a saw, and an image
+      as a piece of wood, it probably won't do you a great deal of harm.)
+    </para>
+    <note>
+      <para>
+        See <link linkend="gimp-concepts-toolbox">Main Windows: The
+        Toolbox</link> for an overview of the toolbox and its components.
+      </para>
+    </note>
+    <para>
+      <acronym>GIMP</acronym> has a diverse assortment of tools that let you
+      perform a large variety of tasks. The tools can be thought of as falling
+      into five categories:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <emphasis>Selection tools</emphasis>, which specify or modify the
+          portion of the image that will be affected by subsequent actions;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Paint tools</emphasis>, which alter the colors in some
+          part of the image;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Transform tools</emphasis>, which alter the geometry of
+          the image;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Color tools</emphasis>, which alter the distribution of
+          colors across the entire image;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis>Other tools</emphasis>, which don't fall into the other
+          four categories.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+
+  <sect2 id="gimp-toolbox-icons">
+    <title>Tool Icons</title>
+
+    <figure>
+      <title>The Tool Icons in the Toolbox</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata format="PNG" fileref="images/toolbox/toolbox-icons.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <para>
+      Most tools can be activated by clicking on an icon in the Toolbox. By
+      default, some tools are accessible only via the menus (namely the Color
+      tools are accessible only either as
+      <menuchoice>
+        <guimenu>Colors</guimenu>
+      </menuchoice>
+      or as
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Colors</guisubmenu>
+      </menuchoice>).
+      Every tool, in fact, can be activated from the
+      <emphasis>Tools</emphasis> menu; also, every tool can be activated from
+      the keyboard using an accelerator key.
+    </para>
     <para>
-      See <link linkend="gimp-concepts-toolbox">Main Windows: The
-      Toolbox</link> for an overview of the toolbox and its components.
+      In the default setup, created when <acronym>GIMP</acronym> is first
+      installed, not all tools show icons in the Toolbox: the Color tools are
+      omitted. You can customize the set of tools that are shown in the
+      Toolbox using the <link linkend="gimp-tools-dialog">Tools dialog</link>.
+      There are two reasons you might want to do this: first, if you only
+      rarely use a tool, it might be easier to find the tools you want if the
+      distracting icon is removed; second, if you use the Color tools a lot,
+      you might find it convenient to have icons for them easily available. In
+      any case, regardless of the Toolbox, you can always access any tool at
+      any time using the <guimenu>Tools</guimenu> menu from an image menubar.
     </para>
-  </note>
-  <para>
-    <acronym>GIMP</acronym> has a diverse assortment of tools that let you
-    perform a large variety of tasks. The tools can be thought of as falling
-    into five categories: <emphasis>Selection tools</emphasis>, which specify
-    or modify the portion of the image that will be affected by subsequent
-    actions; <emphasis>Paint tools</emphasis>, which alter the colors in some
-    part of the image; <emphasis>Transform tools</emphasis>, which alter the
-    geometry of the image; <emphasis>Color tools</emphasis>, which alter the
-    distribution of colors across the entire image; and <emphasis>Other
-    tools</emphasis>, which don't fall into the other four categories.
-  </para>
-  <para>
-    Most tools can be activated by clicking on an icon in the Toolbox.
-    Some, however (namely, the Color tools), are accessible only via
-    the menus, either as
-    <menuchoice>
-      <guimenu>Colors</guimenu>
-    </menuchoice>
-    or as
-    <menuchoice>
-      <guimenu>Tools</guimenu>
-      <guisubmenu>Colors</guisubmenu>
-    </menuchoice>.
-    Every tool, in fact, can be activated from the <emphasis>Tools</emphasis>
-    menu; also, every tool can be activated from the keyboard using an
-    accelerator key.
-  </para>
-  <para>
-    In the default setup, created when <acronym>GIMP</acronym> is first
-    installed, not all tools show icons in the Toolbox: the Color tools are
-    omitted. You can customize the set of tools that are shown in the Toolbox
-    using the <link linkend="gimp-tools-dialog">Tools dialog</link>. There are
-    two reasons you might want to do this: first, if you only rarely use a
-    tool, it might be easier to find the tools you want if the distracting
-    icon is removed; second, if you use the Color tools a lot, you might find
-    it convenient to have icons for them easily available. In any case,
-    regardless of the Toolbox, you can always access any tool at any time
-    using the <guimenu>Tools</guimenu> menu from an image menubar.
-  </para>
-  <para>
-    The shape of the cursor changes when it is inside an image, to one that
-    indicates which tool is active (if in <guimenu>Preferences</guimenu> you have
-    set
-    <menuchoice>
-      <guimenu>Image Windows</guimenu>
-      <guisubmenu>Mouse Pointers</guisubmenu>
-      <guimenuitem>Pointer mode</guimenuitem>
-      <guimenuitem>Tool icon</guimenuitem>
-    </menuchoice>).
-  </para>
+    <para>
+      The shape of the cursor changes when it is inside an image, to one that
+      indicates which tool is active (if in <guimenu>Preferences</guimenu> you
+      have set
+      <menuchoice>
+        <guimenu>Image Windows</guimenu>
+        <guisubmenu>Mouse Pointers</guisubmenu>
+        <guimenuitem>Pointer mode</guimenuitem>
+        <guimenuitem>Tool icon</guimenuitem>
+      </menuchoice>).
+    </para>
+  </sect2>
+
+  <!-- Color and Indicator Area (id=gimp-toolbox-areas) -->
+  <xi:include href="toolbox-color-area.xml"/>
 
   <sect2 id="gimp-tool-options-dialog">
     <title>Tool Options</title>
 
     <figure>
-      <title>Tool Options dialog for the Rectangle Select tool</title>
+      <title>Tool Options Dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/tool-options-rectsel.png"/>
+            fileref="images/toolbox/toolbox-tool-options.png"/>
+            <!--fileref="images/toolbox/tool-options-rectsel.png"/-->
         </imageobject>
+        <caption>
+          <para>
+            Tool Options dialog of the Paintbrush tool (with
+            <link linkend="gimp-dockable-dock-bars">docking bars</link> at its
+            top and bottom).
+          </para>
+        </caption>
       </mediaobject>
     </figure>
     <para>
diff --git a/src/toolbox/path.xml b/src/toolbox/path.xml
index a79f9eb..85d5fb0 100644
--- a/src/toolbox/path.xml
+++ b/src/toolbox/path.xml
@@ -101,7 +101,7 @@
             <guilabel>Design</guilabel>,<guilabel>Edit</guilabel>
             and <guilabel>Move</guilabel>.  <keycap>Ctrl</keycap> key
             toggles between Design and Edit.  <keycap>Alt</keycap> (or
-            <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo> )
+            <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo>)
             key toggles between Design and Move.
           </para>
         </listitem>
diff --git a/src/toolbox/toolbox-color-area.xml b/src/toolbox/toolbox-color-area.xml
index 87454a6..81d1a57 100644
--- a/src/toolbox/toolbox-color-area.xml
+++ b/src/toolbox/toolbox-color-area.xml
@@ -10,10 +10,20 @@
   2005-08-18 de reviewed by axel.wernicke
   2005-09-04 add en;fr in swap-colors by j.hardelin
 -->
-<sect1 id="gimp-toolbox-areas">
+<sect2 id="gimp-toolbox-areas">
   <title>Color and Indicator Area</title>
 
-  <sect2 id="gimp-toolbox-color-area">
+  <figure>
+    <title>Color and Indicator Area in the Toolbox</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata format="PNG"
+          fileref="images/toolbox/toolbox-show-area.png"/>
+      </imageobject>
+    </mediaobject>
+  </figure>
+
+  <sect3 id="gimp-toolbox-color-area">
     <title>Color Area</title>
 
     <indexterm>
@@ -31,11 +41,11 @@
     </indexterm>
 
     <figure>
-      <title>Color area in the Toolbox Palette</title>
+      <title>Active Colors in the Toolbox</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
-            fileref="images/toolbox/toolbox-palette.png"/>
+            fileref="images/toolbox/toolbox-active-colors.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -78,10 +88,10 @@
         </listitem>
       </varlistentry>
     </variablelist>
-  </sect2>
+  </sect3>
 
-  <sect2 id="gimp-toolbox-indicator-area">
-    <title>Indicator Area</title>
+  <sect3 id="gimp-toolbox-indicator-area">
+    <title>Tools Indicator Area</title>
 
     <indexterm>
       <primary>Toolbox</primary>
@@ -101,10 +111,11 @@
     </indexterm>
 
     <figure>
-      <title>Active tool indicator area</title>
+      <title>Active Brush, Pattern and Gradient in the Toolbox</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/toolbox-bpg.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/toolbox-active-bpg.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -113,10 +124,10 @@
       and gradient. Clicking on any of them brings up a dialog that allows you
       to change it.
     </para>
-  </sect2>
+  </sect3>
 
-  <sect2 id="gimp-toolbox-image-area">
-    <title>Active image Area</title>
+  <sect3 id="gimp-toolbox-image-area">
+    <title>Active Image Area</title>
 
     <indexterm>
       <primary>Toolbox</primary>
@@ -124,10 +135,11 @@
     </indexterm>
 
     <figure>
-      <title>Current image in the toolbox</title>
+      <title>Active Image in the Toolbox</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/toolbox-image.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/toolbox-active-image.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -140,6 +152,9 @@
       enabled XDS<footnote><para>
         See <xref linkend="bibliography-online-xds"/>.
       </para></footnote>
+      file manager to directly save the corresponding image.
+    </para>
+<!--
       file manager to directly save the corresponding image; this opens a
       dialog where you can enter a name for the image:
     </para>
@@ -151,5 +166,6 @@
         </imageobject>
       </mediaobject>
     </figure>
-  </sect2>
-</sect1>
+-->
+  </sect3>
+</sect2>
diff --git a/src/using/layers.xml b/src/using/layers.xml
index 3622074..c89021a 100644
--- a/src/using/layers.xml
+++ b/src/using/layers.xml
@@ -44,7 +44,7 @@
       <para>
         When you <quote>cut</quote> or <quote>copy</quote> something, and
         then paste it using
-        <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo> or
+        <keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> or
         <menuchoice>
           <guimenu>Edit</guimenu>
           <guimenuitem>Paste</guimenuitem>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]