[gimp-help-2] Update toolbox



commit 31f9d91803abd2fcc92da560ab5be97493dad93d
Author: Julien Hardelin <jm hard wanadoo fr>
Date:   Mon Apr 30 08:15:14 2012 +0200

    Update toolbox

 images/C/preferences/prefs-toolbox.png    |  Bin 30325 -> 10410 bytes
 images/C/toolbox/del-button.png           |  Bin 816 -> 948 bytes
 images/C/toolbox/reg-button.png           |  Bin 759 -> 543 bytes
 images/C/toolbox/resto-button.png         |  Bin 868 -> 834 bytes
 images/C/toolbox/toolbox-icons.png        |  Bin 38242 -> 12432 bytes
 images/C/toolbox/toolbox-tool-options.png |  Bin 16584 -> 7208 bytes
 images/C/using/dock-anchor-dialog.png     |  Bin 0 -> 21848 bytes
 images/C/using/dock-integrate-dialog.png  |  Bin 0 -> 16799 bytes
 images/C/using/toolbox-description.png    |  Bin 34608 -> 11781 bytes
 images/callouts/28x28-empty-01.png        |  Bin 0 -> 324 bytes
 images/callouts/28x28-empty-02.png        |  Bin 0 -> 462 bytes
 images/callouts/28x28-empty-03.png        |  Bin 0 -> 498 bytes
 images/callouts/28x28-empty-04.png        |  Bin 0 -> 417 bytes
 src/concepts/docks.xml                    |  326 +++++++++++------------------
 src/concepts/imagewindow.xml              |   13 +-
 src/concepts/toolbox.xml                  |   50 +++--
 src/dialogs/dialogs-misc.xml              |    2 +-
 src/toolbox/color/brightness-contrast.xml |    3 +-
 src/toolbox/color/color-balance.xml       |    3 +-
 src/toolbox/color/colorize.xml            |    3 +-
 src/toolbox/color/curves.xml              |   10 +-
 src/toolbox/color/desaturate.xml          |    4 +-
 src/toolbox/color/hue-saturation.xml      |    3 +-
 src/toolbox/color/levels.xml              |    8 +-
 src/toolbox/color/posterize.xml           |    4 +-
 src/toolbox/color/threshold.xml           |    4 +-
 src/toolbox/intro.xml                     |   38 ++--
 src/using/preferences/prefs-toolbox.xml   |   23 ++
 28 files changed, 216 insertions(+), 278 deletions(-)
---
diff --git a/images/C/preferences/prefs-toolbox.png b/images/C/preferences/prefs-toolbox.png
old mode 100644
new mode 100755
index c57f722..bdc0018
Binary files a/images/C/preferences/prefs-toolbox.png and b/images/C/preferences/prefs-toolbox.png differ
diff --git a/images/C/toolbox/del-button.png b/images/C/toolbox/del-button.png
old mode 100644
new mode 100755
index c45da8b..46630b4
Binary files a/images/C/toolbox/del-button.png and b/images/C/toolbox/del-button.png differ
diff --git a/images/C/toolbox/reg-button.png b/images/C/toolbox/reg-button.png
old mode 100644
new mode 100755
index 1e38a0a..896611a
Binary files a/images/C/toolbox/reg-button.png and b/images/C/toolbox/reg-button.png differ
diff --git a/images/C/toolbox/resto-button.png b/images/C/toolbox/resto-button.png
old mode 100644
new mode 100755
index acfe9e7..97f8c2a
Binary files a/images/C/toolbox/resto-button.png and b/images/C/toolbox/resto-button.png differ
diff --git a/images/C/toolbox/toolbox-icons.png b/images/C/toolbox/toolbox-icons.png
old mode 100644
new mode 100755
index d0fccd6..c02082a
Binary files a/images/C/toolbox/toolbox-icons.png and b/images/C/toolbox/toolbox-icons.png differ
diff --git a/images/C/toolbox/toolbox-tool-options.png b/images/C/toolbox/toolbox-tool-options.png
old mode 100644
new mode 100755
index d7fdd33..36650d8
Binary files a/images/C/toolbox/toolbox-tool-options.png and b/images/C/toolbox/toolbox-tool-options.png differ
diff --git a/images/C/using/dock-anchor-dialog.png b/images/C/using/dock-anchor-dialog.png
new file mode 100755
index 0000000..c14c2e8
Binary files /dev/null and b/images/C/using/dock-anchor-dialog.png differ
diff --git a/images/C/using/dock-integrate-dialog.png b/images/C/using/dock-integrate-dialog.png
new file mode 100755
index 0000000..044ac60
Binary files /dev/null and b/images/C/using/dock-integrate-dialog.png differ
diff --git a/images/C/using/toolbox-description.png b/images/C/using/toolbox-description.png
old mode 100644
new mode 100755
index 75c39f9..bcee478
Binary files a/images/C/using/toolbox-description.png and b/images/C/using/toolbox-description.png differ
diff --git a/images/callouts/28x28-empty-01.png b/images/callouts/28x28-empty-01.png
new file mode 100755
index 0000000..f2ba694
Binary files /dev/null and b/images/callouts/28x28-empty-01.png differ
diff --git a/images/callouts/28x28-empty-02.png b/images/callouts/28x28-empty-02.png
new file mode 100755
index 0000000..4b6acb6
Binary files /dev/null and b/images/callouts/28x28-empty-02.png differ
diff --git a/images/callouts/28x28-empty-03.png b/images/callouts/28x28-empty-03.png
new file mode 100755
index 0000000..4851065
Binary files /dev/null and b/images/callouts/28x28-empty-03.png differ
diff --git a/images/callouts/28x28-empty-04.png b/images/callouts/28x28-empty-04.png
new file mode 100755
index 0000000..6c7a90b
Binary files /dev/null and b/images/callouts/28x28-empty-04.png differ
diff --git a/src/concepts/docks.xml b/src/concepts/docks.xml
old mode 100644
new mode 100755
index 811b998..2cdb7b3
--- a/src/concepts/docks.xml
+++ b/src/concepts/docks.xml
@@ -2,14 +2,7 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-  2008-07-31 prokoudine: yet another shot at Russian content
-  2008-03-23 reviewed 'ko' by Mr.Dust
-  2008-01-14 alex falappa: fixed outstanding TODOs for'it'
   2007-05-28 Fixed Auto Follow Active Image by j.h
-  2007-03-19 reviewed Korean translation by Dust
-  2006-07-27 added italian translation by ciampix
-  2006-05-02 added Korean translation by Dust
-  2006-02-08 added norwegian translation by KoSt
   2005-12-18 reviewed by lexa
 -->
 <sect2 id="gimp-concepts-docks">
@@ -23,175 +16,136 @@
     <secondary>Docking</secondary>
   </indexterm>
 
-  <sect3 id="gimp-dock-separator">
-    <title>Docking Areas</title>
-
-    <indexterm>
-      <primary>Docks</primary>
-      <secondary>Docking areas</secondary>
-    </indexterm>
+  <sect3 id="gimp-dockable-dock-bars">
+    <title>Organizing Dialogs</title>
 
     <para>
-      <acronym>GIMP</acronym> has great flexibility for arranging
-      dialog windows on your screen. Instead of placing each dialog in its
-      own window, you can group dialogs using docks. A "dock" is a
-      container window that can hold a collection of persistent dialogs, such
-      as the Tool Options dialog, Brushes dialog, Palette dialog, etc. Docks
-      cannot, however, hold non-persistent dialogs such as
-      the Preferences dialog or an Image window.
+      <acronym>GIMP</acronym> has great flexibility for arranging dialog on
+      your screen. A <quote>dialog</quote> is a moving window which
+      contains options for a tool or is dedicated to a special task. A
+      <quote>dock</quote> is a container which can hold a collection of
+      persistent dialogs, such as the Tool Options dialog, Brushes dialog,
+      Palette dialog, etc. Docks cannot, however, hold non-persistent dialogs
+      such as the Preferences dialog or an Image window.
     </para>
     <para>
-      <acronym>GIMP</acronym> has two default docks:
+      <acronym>GIMP</acronym> has three default docks:
       <itemizedlist>
         <listitem>
           <para>
-            The Layers, Channels and Paths dock.
+            the Tool Options dock under the Toolbox in the left panel,
           </para>
         </listitem>
         <listitem>
           <para>
-            The Brushes, Patterns and Gradients dock.
+            the Layers, Channels, Paths and Undo dock in the upper part of the
+            right panel,
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            the Brushes, Patterns and Gradients dock in the lower part of the
+            right panel.
           </para>
         </listitem>
       </itemizedlist>
-      In these docks, each window is in its own tab.
+      In these docks, each dialog is in its own tab.
     </para>
     <para>
-      The Toolbox is a <emphasis>utility window</emphasis>. The
-      Tool Options window is normally attached under the Toolbox and displays
-      the options of the selected tool.
+      In multi-window mode, the Toolbox is a <emphasis>utility
+      window</emphasis> and not a dock. In single-window mode, it belongs to
+      the single window.
     </para>
     <para>
       Use
       <menuchoice>
         <guimenu>Windows</guimenu>
         <guisubmenu>Dockable Dialogs</guisubmenu>
-      </menuchoice>.
-      view a list of dockable dialogs. Choose a dockable dialog from
+      </menuchoice>
+      to view a list of dockable dialogs. Select a dockable dialog from
       the list to view the dialog. If the dialog is available in a dock,
-      then it is made visible. If the dialog is not in a dock, then
-      it is displayed in its own window. Note that the Windows command
-      is only available while an image is open for editing.
-    </para>
-    <para>
-      Every dockable dialog has two types of docking areas: the docking bars
-      and the docking-tab area. In a dock, the docking-tab area covers
-      the entire window.
-    </para>
-
-    <figure id="figure-docking-types">
-      <title>The two docking types</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/using/dock-attached.png"
-            format="PNG"/>
-        </imageobject>
-        <caption>
-          <para>The dockable window is docked onto a dock bar.</para>
-        </caption>
-      </mediaobject>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/using/dock-tab.png"
-            format="PNG"/>
-        </imageobject>
-        <caption>
+      then it is made visible. If the dialog is not in a dock, the behavior
+      is different in multi and single window modes:
+      <itemizedlist>
+        <listitem>
           <para>
-            The dockable window is docked onto the docking-tab area. A
-            new tab has been created.
+            In multi-window mode, a new window, containing the dialog, appears
+            on the screen.
           </para>
-        </caption>
-      </mediaobject>
-    </figure>
-  </sect3>
-
-  <sect3 id="gimp-dockable-dock-bars">
-    <title>Docking Bars</title>
-
-    <indexterm>
-      <primary>Docks</primary>
-      <secondary>Docking bars</secondary>
-    </indexterm>
-
-    <para>
-      Each dockable window has two <emphasis>docking bars</emphasis>. These
-      bars are thin gray bars, very unobtrusive and easy to not notice: most
-      people don't realize that they exist until they are specifically pointed
-      out.
-    </para>
-    <figure id="figure-dock">
-      <title>Docking bars</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata format="PNG"
-            fileref="images/using/dialog-highlight-dockbar.png"/>
-        </imageobject>
-        <caption>
+        </listitem>
+        <listitem>
           <para>
-            A window with <emphasis>docking bars</emphasis> highlighted.
+            In single-window mode, the dialog is automatically docked to the
+            Layers-Undo dock as a tab.
           </para>
-        </caption>
-      </mediaobject>
-    </figure>
-  </sect3>
-
-  <sect3 id="gimp-dockable-drag-area">
-    <title>Docking Drag Handles</title>
-
-    <indexterm>
-      <primary>Docks</primary>
-      <secondary>Docking drag handle</secondary>
-    </indexterm>
+        </listitem>
+      </itemizedlist>
+    </para>
 
     <para>
-      Each dockable window has a <emphasis>drag handle area</emphasis>,
-      as highlighted in the figure below. The cursor changes to a hand
-      shape when it is over a drag handle area. To dock a dialog, click in
-      the drag handle area, and drag it:
+      You can click-and-drag a tab and drop it in the wanted place:
       <itemizedlist>
         <listitem>
           <para>
-            onto a docking bar so that the dialog is attached
-            below the docking bar in the window,
+            either in the tab bar of a dock, to integrate it in the dialog
+            group,
           </para>
         </listitem>
         <listitem>
           <para>
-            or into the docking-tab area so that the dialog is
-            added as a tab.
+            or on a docking bar that appears as a blue line when the mouse     
+            pointer goes over a dock border, to anchor the dialog to the dock.
           </para>
         </listitem>
       </itemizedlist>
     </para>
-    <figure id="figure-docked-dialogs">
-      <title>A dockable window, with the drag handle area highlighted</title>
+
+    <para>
+      In multi-window mode, you can also click on the dialog title and drag it
+      to the wanted place.
+    </para>
+
+    <figure>
+      <title>Integrating a new dialog in a dialog group</title>
       <mediaobject>
         <imageobject>
-          <imagedata format="PNG"
-            fileref="images/using/dialog-highlight-handle.png"/>
+          <imagedata fileref="images/using/dock-integrate-dialog.png"
+            format="PNG"/>
         </imageobject>
         <caption>
           <para>
-            This screenshot shows the area that can be used to drag a
-            dialog window onto a dock. It can also be used to take a dialog
-            off the dock.
+            Here, in multi-window mode, the Histogram dialog was dragged to the
+            tab bar of the Layers-Undo dock.
           </para>
         </caption>
       </mediaobject>
     </figure>
-
     <para>
-      You can drag more than one dialog onto the same docking bar. If you do,
-      the dialogs are displayed as tabs, represented by iconic symbols at the
-      top. Click on the iconic symbol to bring the tab to the front.
+      More simpler: the <command>Add tab</command> command in the Tab menu <xref
+      linkend="gimp-dockable-menu"/>.
     </para>
 
-    <note>
-      <para>
-        You can also add, detach, or delete a tab window
-        using the Tab menu (see below).
-      </para>
-    </note>
+    <figure>
+      <title>Anchoring a dialog to a dock border</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/using/dock-anchor-dialog.png"
+            format="PNG"/>
+        </imageobject>
+        <caption>
+          <para>
+            The Histogram dialog dragged to the left vertical docking bar and
+            the result: the dialog anchored to the left border of the
+            Layers-Undo dock (this dialog now belongs to the right panel).
+          </para>
+          <para>
+            So, you can arrange dialogs in a <emphasis>multi-column</emphasis>
+            display, interesting if you work with two screens, one for dialogs,
+            the other for images.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
 
     <tip>
       <para>
@@ -205,47 +159,6 @@
     </tip>
   </sect3>
 
-  <sect3 id="gimp-dock-image-menu">
-    <title>Image Selection</title>
-
-    <anchor id="gimp-dock-auto-button" xreflabel="Auto button"/>
-    <indexterm>
-      <primary>Docks</primary>
-      <secondary>Auto button</secondary>
-    </indexterm>
-    <para>
-      Some docks contain an <emphasis>Image Selection Menu</emphasis>:
-      a menu listing all of the images open in <acronym>GIMP</acronym>.
-      The Image Menu displays the name of the image whose information
-      is shown in the dock.
-      Use the <guilabel>Auto</guilabel> button to toggle the value of
-      <guilabel>Auto Follow Active Image</guilabel>.
-      Suppose you are using the Layers dialog and you want to see
-      the layers for a different image. Select the desired image from the
-      Image Selection Menu. Although this is convenient, do not forget that
-      you changed the working image for the dock. Setting
-      <guilabel>Auto Follow Active Image</guilabel> from the Tab menu
-      helps to avoid this problem.
-    </para>
-    <figure id="figure-highlight-imagemenu">
-      <title>A dock with an Image Menu highlighted.</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata format="PNG"
-            fileref="images/using/dialog-highlight-imagemenu.png"/>
-        </imageobject>
-      </mediaobject>
-    </figure>
-    <para>
-      By default, a <quote>Layers, Channels, and Paths</quote>
-      dock shows an Image Menu at the top, and other types of docks do not.
-      You can always add or remove an Image Menu, however, using the
-      <quote>Show Image Menu</quote> toggle in the Tab menu, as described
-      below. (Exception: you
-      cannot add an Image Menu to the dock that contains the Toolbox.)
-    </para>
-  </sect3>
-
   <sect3 id="gimp-dockable-menu">
     <title>Tab Menu</title>
 
@@ -271,7 +184,7 @@
       tabs, or closing or detaching tabs.
     </para>
     <figure>
-      <title>Tab menu from the Layers dialog.</title>
+      <title>The Tab menu of the Layers dialog.</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/using/tab-menu.png" format="PNG"/>
@@ -290,7 +203,7 @@
             <secondary>Context Menu</secondary>
           </indexterm>
           <para>
-            At the top of each Tab menu is an entry that opens into the
+            At the top of each Tab menu, an entry opens the
             dialog's context menu, which contains operations specific to that
             particular type of dialog. For example, the context menu for the
             Layers tab is <guilabel>Layers Menu</guilabel>, which contains
@@ -353,6 +266,9 @@
             location where it cannot be docked.
           </para>
           <para>
+            It's a way to create a paradoxical new window in single-window mode!
+          </para>
+          <para>
             If the tab is <link linkend="gimp-dock-tab-lock">locked</link>,
             this menu item is insensitive and grayed out.
           </para>
@@ -505,42 +421,38 @@
             dialogs: for brushes and patterns, the default is a grid; for most
             other things, the default is a list.
           </para>
-          <tip>
-            <para>
-              When the treeview is <guilabel>View as List</guilabel>, pressing
-              <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> (or
-              <keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo>,
-              it depends on your GTK+ keybindings), opens a text box, a
-              search field, where you can enter the first letter(s) of the
-              name of the item you want. The search field will not open
-              with <guilabel>View as Grid</guilabel>.
-            </para>
-            <!-- IMHO colored blocks (like tips) should be short, so I
-                 moved the closing tag here - ude 2009-06-13 -->
-          </tip>
-          <figure>
-            <title>The list search field.</title>
-            <mediaobject>
-              <imageobject>
-                <imagedata format="PNG"
-                           fileref="images/using/list-search-field.png"/>
-              </imageobject>
-              <caption>
-                <para>
-                  Use
-                  <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>
-                  to open the list search field.
-                </para>
-              </caption>
-            </mediaobject>
-          </figure>
+
+          <para>
+            When the tree-view is <guilabel>View as List</guilabel>, you can
+            use tags. Please see <xref linkend="gimp-tagging"/>.
+          </para>
+          
+          <para>
+            You can also use a list search field:
+            <figure>
+              <title>The list search field.</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                            fileref="images/using/list-search-field.png"/>
+                </imageobject>
+                <caption>
+                  <para>
+                    Use
+                    <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>
+                    to open the list search field.
+                  </para>
+                </caption>
+              </mediaobject>
+            </figure>
+          </para>
           <para>
             The list search field automatically closes after five seconds
             if you do nothing.
           </para>
           <note>
             <para>
-              The search field shortcut is also available for the treeview you
+              The search field shortcut is also available for the tree-view you
               get in the <quote>Brush</quote>, <quote>Font</quote> or
               <quote>Pattern</quote> option of several tools.
             </para>
@@ -562,7 +474,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
-                           fileref="images/using/dialog-button-bar.png"/>
+                            fileref="images/using/dialog-button-bar.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -574,8 +486,16 @@
         <listitem>
           <para>
             This is a toggle. If it is checked, then an Image Menu is shown at
-            the top of the dock
-            (see <xref linkend="figure-highlight-imagemenu"/>).
+            the top of the dock:
+            <figure id="figure-highlight-imagemenu">
+              <title>A dock with an Image Menu highlighted.</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata format="PNG"
+                    fileref="images/using/dialog-highlight-imagemenu.png"/>
+                </imageobject>
+              </mediaobject>
+            </figure>
             It is not available for dialogs docked below the Toolbox. This
             option is interesting only if you have several open images on your
             screen.
@@ -595,12 +515,6 @@
             Image Selection. If enabled, you  can also select it by
             activating the image directly (clicking on its title bar).
           </para>
-          <!--<para>
-            <guilabel>Auto Follow Active Image</guilabel> controls how the
-            Image Menu functions. If disabled, you must manually select the
-            image in the Image menu. If enabled, however, the Image Menu
-            changes to the Active Image when a new image is selected.
-          </para>-->
         </listitem>
       </varlistentry>
     </variablelist>
diff --git a/src/concepts/imagewindow.xml b/src/concepts/imagewindow.xml
index 11c08f1..dc2aade 100755
--- a/src/concepts/imagewindow.xml
+++ b/src/concepts/imagewindow.xml
@@ -320,12 +320,12 @@
   </orderedlist>
   
   <para>
-    <anchor id="dotted-lines"/>
+    <anchor id="dotted-strips"/>
     <indexterm>
-      <primary>Dotted lines</primary>
+      <primary>Dotted strips</primary>
     </indexterm>
 
-    <emphasis>Dotted lines</emphasis>:
+    <emphasis>Dotted strips</emphasis>:
 
     <mediaobject>
       <imageobject>
@@ -334,10 +334,11 @@
       </imageobject>
     </mediaobject>
     
-    This is a feature specific to the single-window mode.    
-    These small dotted vertical lines, on the left and the right of the image,  
+    In single-window mode,
+    depending on your system and gtk theme, you can notice these small dotted
+    strips, or nothing, on the left and the right side of the image. They
     mark the limit between the image area and the panels, from top to bottom. 
-    When the mouse pointer passes over this line, it turns to a double-arrow.
+    When the mouse pointer passes over this limit, it turns to a double-arrow.
     Then, click-and-drag to move the limit between image area and panels.
   </para>
     
diff --git a/src/concepts/toolbox.xml b/src/concepts/toolbox.xml
old mode 100644
new mode 100755
index bd64f3b..26b8792
--- a/src/concepts/toolbox.xml
+++ b/src/concepts/toolbox.xml
@@ -2,15 +2,10 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Version History:
+  2012-04-15 j.h: update to v2.8
   2009-02-19 j.h: added tip for Removing Wilber's eyes
   2008-12-10 JPL: updated to v2.6
-  2008-06-04 prokoudine: fixes to Russian translation
   2008-01-04 ude: replaced calloutlist with orderedlist
-  2007-02-15: fixed Korean translation by Dust
-  2006-09-06: added norwegian translation by KoSt
-  2006-05-02: added Korean translation by Dust
-  2006-02-17: added italian translation by ciampix
-  2005-09-03: Addition en;fr at file end
 -->
 <sect2 id="gimp-concepts-toolbox">
   <title>The Toolbox</title>
@@ -29,9 +24,8 @@
     </mediaobject>
   </figure>
   <para>
-    The Toolbox is the heart of <acronym>GIMP</acronym>. If you close it, you
-    quit <acronym>GIMP</acronym>. Here is a quick tour of what you will find
-    there.
+    The Toolbox is the heart of <acronym>GIMP</acronym>. 
+    Here is a quick tour of what you will find there.
   </para>
   <tip>
     <para>
@@ -43,6 +37,16 @@
       about the thing that is underneath the mouse.
     </para>
   </tip>
+  <para>
+    By default, only the Foreground-background icon is visible. You can add
+    Brush-Pattern-Gradient icons and Active Image icon through
+    <menuchoice>
+      <guimenu>Edit</guimenu>
+      <guisubmenu>Preferences</guisubmenu>
+      <guimenuitem>Toolbox</guimenuitem>
+    </menuchoice>:
+    <xref linkend="prefs-tools-config"/>.
+  </para>
   <orderedlist>
     <listitem>
       <para>
@@ -86,16 +90,19 @@
         image is the <quote>active image</quote>. Here you find a small
         iconic representation of the active image. Click the icon to display
         a dialog with a list of the currently open images, click an
-        image in the dialog to make it active. You can also click an
-        image window to make it the active image.
+        image in the dialog to make it active. Usually, you click an
+        image window in multi-window mode, or an image tab in single-window
+        mode, to make it the active image.
+      </para>
+      <para>
+        <indexterm>
+          <primary>XDS</primary>
+        </indexterm>
+        You can <quote>Drop to an XDS file manager to save
+        the image</quote>. <acronym>XDS</acronym> is an acronym for <quote>X
+        Direct Save Protocol</quote>: an additional feature for the X Window
+        System graphical user interface for Unix-like operating systems.
       </para>
-      <note>
-        <para>
-          The <quote>Active Image</quote> preview is disabled by default. If
-          you want it, you can enable it in the
-          <link linkend="gimp-prefs-toolbox">Toolbox Preferences</link> tab.
-        </para>
-      </note>
     </listitem>
   </orderedlist>
   <note>
@@ -123,11 +130,8 @@
   </tip>
   <tip>
     <para>
-      Drag and drop an image into the Toolbox window to open the image
-      in its own Image window. This is very different than dragging
-      an image into an existing Image window, which adds it to the
-      currently open image in a new layer&mdash;usually not what
-      you want.
+      Drag and drop an image from a file browser into the Toolbox window to open
+      the image in its own Image window or tab.
     </para>
   </tip>
 </sect2>
diff --git a/src/dialogs/dialogs-misc.xml b/src/dialogs/dialogs-misc.xml
index 1a529b4..8e4c4cc 100755
--- a/src/dialogs/dialogs-misc.xml
+++ b/src/dialogs/dialogs-misc.xml
@@ -8,7 +8,7 @@
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-dialogs-misc">
   <title>Misc. Dialogs</title>
-  <xi:include href="tools-dialog.xml"/>
+  <!--<xi:include href="tools-dialog.xml"/>-->
   <xi:include href="tool-presets-dialog.xml"/>
   <xi:include href="tool-preset-editor.xml"/>
   <xi:include href="device-status-dialog.xml"/>
diff --git a/src/toolbox/color/brightness-contrast.xml b/src/toolbox/color/brightness-contrast.xml
old mode 100644
new mode 100755
index 1d25bde..1868fe8
--- a/src/toolbox/color/brightness-contrast.xml
+++ b/src/toolbox/color/brightness-contrast.xml
@@ -66,8 +66,7 @@
                 fileref="images/toolbox/stock-tool-brightness-contrast-22.png"/>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
-          For this, go to
-          <link linkend="gimp-tools-dialog">Tools Dialog</link>.
+          For this, please refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/color-balance.xml b/src/toolbox/color/color-balance.xml
old mode 100644
new mode 100755
index 8150e3b..e558e5b
--- a/src/toolbox/color/color-balance.xml
+++ b/src/toolbox/color/color-balance.xml
@@ -56,8 +56,7 @@
                   fileref="images/toolbox/stock-tool-color-balance-22.png"/>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
-          For this, go to
-          <link linkend="gimp-tools-dialog">Tools Dialog</link>.
+          For this, please refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/colorize.xml b/src/toolbox/color/colorize.xml
old mode 100644
new mode 100755
index f47a717..d7c8490
--- a/src/toolbox/color/colorize.xml
+++ b/src/toolbox/color/colorize.xml
@@ -62,8 +62,7 @@
                   fileref="images/toolbox/stock-tool-colorize-22.png"/>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
-          For this, go to
-          <link linkend="gimp-tools-dialog">Tools Dialog</link>.
+          For this, please refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/curves.xml b/src/toolbox/color/curves.xml
old mode 100644
new mode 100755
index e52e10d..0c35f53
--- a/src/toolbox/color/curves.xml
+++ b/src/toolbox/color/curves.xml
@@ -56,8 +56,8 @@
             <inlinegraphic
                   fileref="images/toolbox/stock-tool-curves-22.png"/>
           </guiicon>
-          in Toolbox, if this tool has been installed there (see
-          <link linkend="gimp-tools-dialog">Tools dialog</link>).
+          in Toolbox, if this tool has been installed there. For this, please
+          refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
@@ -298,9 +298,9 @@
     <variablelist>
       <title>Tool Options dialog</title>
       <para>
-        Although this tool is not present in the Toolbox by default (see
-        <xref linkend="gimp-tools-dialog"/> if you want to add it),
-        nevertheless it has a Tool Option Dialog under the Toolbox. These
+        Although this tool is not present in the Toolbox by default (For this,
+        please refer to <xref linkend="gimp-prefs-toolbox"/> if you want to add
+        it), nevertheless it has a Tool Option Dialog under the Toolbox. These
         options are described here:
       </para>
       <varlistentry>
diff --git a/src/toolbox/color/desaturate.xml b/src/toolbox/color/desaturate.xml
old mode 100644
new mode 100755
index 916d017..d341a38
--- a/src/toolbox/color/desaturate.xml
+++ b/src/toolbox/color/desaturate.xml
@@ -63,8 +63,8 @@
             <inlinegraphic
                   fileref="images/toolbox/stock-convert-grayscale-16.png"/>
           </guiicon>
-          in Toolbox, if this tool has been installed there (see
-          <link linkend="gimp-tools-dialog">Tools dialog</link>.
+          in Toolbox, if this tool has been installed there.For this, please
+          refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/hue-saturation.xml b/src/toolbox/color/hue-saturation.xml
old mode 100644
new mode 100755
index f8c2659..1f74b5e
--- a/src/toolbox/color/hue-saturation.xml
+++ b/src/toolbox/color/hue-saturation.xml
@@ -53,8 +53,7 @@
               fileref="images/toolbox/stock-tool-hue-saturation-22.png"/>
           </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
-          For this, go to
-          <link linkend="gimp-tools-dialog">Tools Dialog</link>.
+          For this, please refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/levels.xml b/src/toolbox/color/levels.xml
old mode 100644
new mode 100755
index ee6ce5f..33aca11
--- a/src/toolbox/color/levels.xml
+++ b/src/toolbox/color/levels.xml
@@ -76,8 +76,8 @@
             <inlinegraphic
               fileref="images/toolbox/stock-tool-levels-22.png"/>
           </guiicon>
-          in the toolbox if this tool has been installed there. For this, go
-          to <link linkend="gimp-tools-dialog">Tools Dialog</link>.
+          in the toolbox if this tool has been installed there. For this, please
+          refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
@@ -525,8 +525,8 @@
         </figure>
       </para>
       <para>
-        Although this tool is not present in the Toolbox by default (see
-        <xref linkend="gimp-tools-dialog"/> if you want to add it),
+        Although this tool is not present in the Toolbox by default (please
+        refer to <xref linkend="gimp-prefs-toolbox"/> if you want to add it),
         nevertheless it has a Tool Option Dialog under the Toolbox. These
         options are described here:
       </para>
diff --git a/src/toolbox/color/posterize.xml b/src/toolbox/color/posterize.xml
old mode 100644
new mode 100755
index a4cb7ca..09b9933
--- a/src/toolbox/color/posterize.xml
+++ b/src/toolbox/color/posterize.xml
@@ -49,8 +49,8 @@
             <inlinegraphic
                   fileref="images/toolbox/stock-tool-posterize-22.png"/>
           </guiicon>
-          in Toolbox, if this tool has been installed there (see
-          <link linkend="gimp-tools-dialog">Tools dialog</link>).
+          in Toolbox, if this tool has been installed there. For this, please
+          refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/color/threshold.xml b/src/toolbox/color/threshold.xml
old mode 100644
new mode 100755
index a67b396..5370f1b
--- a/src/toolbox/color/threshold.xml
+++ b/src/toolbox/color/threshold.xml
@@ -71,8 +71,8 @@
             <inlinegraphic
               fileref="images/toolbox/stock-tool-threshold-22.png"/>
           </guiicon>
-          icon in Toolbox if this tool has been installed in it. You can do
-          that through the <link linkend="gimp-tools-dialog">Tool dialog</link>.
+          icon in Toolbox if this tool has been installed in it. For this,
+          please refer to <xref linkend="gimp-prefs-toolbox"/>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/intro.xml b/src/toolbox/intro.xml
old mode 100644
new mode 100755
index 59c9589..910e42f
--- a/src/toolbox/intro.xml
+++ b/src/toolbox/intro.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2012-04-27 update to v2.8 by j.h
   2007-12-01 up to v2.4 fr; en by PP
-  2007-05-29 KoSt: added 'no'
-  2006-09-26 added Korean contents by Mr.Dust
-  2006-01-29 added sect1info
-  2005-11-27 fixed fr lang tag by lexa
   2005-11-26 fixed images and tips structure by romanofski
-  2005-05-15 de reviewed by axel.wernicke
 -->
 <sect1 id="gimp-toolbox" xmlns:xi="http://www.w3.org/2001/XInclude";>
   <title>The Toolbox</title>
@@ -110,7 +106,12 @@
       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>.
+      Toolbox through
+      <menuchoice>
+        <guimenu>Edit</guimenu>
+        <guisubmenu>Preferences</guisubmenu>
+        <guimenuitem>Toolbox</guimenuitem>
+      </menuchoice>.
       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,
@@ -147,9 +148,7 @@
         </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).
+            The Tool Options dialog of the Airbrush tool.
           </para>
         </caption>
       </mediaobject>
@@ -178,14 +177,14 @@
     <para>
       Each tool has its own specific set of options. The choices you make for
       them are kept throughout the session, until you change them. In fact,
-      the tool options are maintained from session to session. The persistance
+      the tool options are maintained from session to session. The persistence
       of tool options across sessions can sometimes be an annoying nuisance: a
       tool behaves very strangely, and you can't figure out why until you
       remember that you were using some unusual option the last time you
       worked with it, two weeks ago.
     </para>
     <para>
-      At the bottom of the Tool Options dialog appear four buttons:
+      At the bottom of the Tool Options dialog, four buttons appear:
     </para>
     <variablelist>
       <varlistentry>
@@ -202,9 +201,10 @@
         <listitem>
           <para>
             This button allows you to save the settings for the current tool,
-            so that you can restore them later. It brings up a small dialog
-            allowing you to give a name to the array of saved options. When
-            you Restore options, only saved sets for the active tool are
+            so that you can restore them later. It brings up the <xref
+            linkend="gimp-presets-dialog"/>
+            allowing you to give a name for the new preset. When
+            you Restore options, only saved presets for the active tool are
             shown, so you need not worry about including the name of the tool
             when you assign a name here.
           </para>
@@ -223,8 +223,8 @@
         </term>
         <listitem>
           <para>
-            This button allows you to restore a previously saved set of
-            options for the active tool. If no option-sets have ever been
+            This button allows you to restore a previously saved preset of
+            options for the active tool. If no presets have ever been
             saved for the active tool, the button will be insensitive.
             Otherwise, clicking it will bring up a menu showing the names of
             all saved option sets: choosing a menu entry will apply those
@@ -247,9 +247,9 @@
           <para>
             This button allows you to delete a previously saved set of options
             for the active tool. If no option-sets have ever been saved for
-            the active tool, the button will be insensitive. Otherwise,
-            clicking it will bring up a menu showing the names of all saved
-            option sets: choosing a menu entry will delete those settings.
+            the active tool, the button will simply repeat the tool name.
+            Otherwise, clicking it will bring up a menu showing the names of all
+            saved presets: the selected preset will be deleted.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/using/preferences/prefs-toolbox.xml b/src/using/preferences/prefs-toolbox.xml
old mode 100644
new mode 100755
index 9f9da6d..1c053bb
--- a/src/using/preferences/prefs-toolbox.xml
+++ b/src/using/preferences/prefs-toolbox.xml
@@ -88,5 +88,28 @@
         </listitem>
       </varlistentry>
     </variablelist>
+    
+    <variablelist id="prefs-tools-config">
+      <title>Tools configuration</title>
+      <indexterm>
+        <primary>Toolbox</primary>
+        <secondary>Configuration</secondary>
+      </indexterm>
+      <varlistentry>
+        <term></term>
+        <listitem>
+          <para>
+            In this list, tools with an eye are present in the Toolbox. By
+            default, color tools have no eye: you can add them to the Toolbox by
+            clicking the corresponding checkbox.
+          </para>
+          <para>
+            This option replaces the Tools Dialog of former
+            <acronym>GIMP</acronym> versions.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+      
   </sect3>
 </sect2>



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