[gimp-help-2] Worked on Docks. Updated screen shots. Brought docs up-to-date.



commit cfa08650848892f4283274916bf9281d9cbaabf5
Author: Andrew Pitonyak <andrew pitonyak org>
Date:   Fri Jul 3 20:27:03 2009 -0400

    Worked on Docks. Updated screen shots. Brought docs up-to-date.

 images/C/using/dialog-button-bar.png          |  Bin 0 -> 14847 bytes
 images/C/using/dialog-highlight-dockbar.png   |  Bin 7277 -> 36110 bytes
 images/C/using/dialog-highlight-handle.png    |  Bin 5519 -> 18227 bytes
 images/C/using/dialog-highlight-imagemenu.png |  Bin 5308 -> 18942 bytes
 images/C/using/dialog-highlight-tabmenu.png   |  Bin 5323 -> 17861 bytes
 images/C/using/tab-menu-add-tab.png           |  Bin 6613 -> 30320 bytes
 images/C/using/tab-menu.png                   |  Bin 1657 -> 17132 bytes
 src/concepts/docks.xml                        |  229 ++++++++++++++-----------
 src/concepts/imagewindow.xml                  |    9 +
 src/concepts/toolbox.xml                      |    9 +
 10 files changed, 146 insertions(+), 101 deletions(-)
---
diff --git a/images/C/using/dialog-button-bar.png b/images/C/using/dialog-button-bar.png
new file mode 100644
index 0000000..d925d64
Binary files /dev/null and b/images/C/using/dialog-button-bar.png differ
diff --git a/images/C/using/dialog-highlight-dockbar.png b/images/C/using/dialog-highlight-dockbar.png
index 2401557..8f44057 100644
Binary files a/images/C/using/dialog-highlight-dockbar.png and b/images/C/using/dialog-highlight-dockbar.png differ
diff --git a/images/C/using/dialog-highlight-handle.png b/images/C/using/dialog-highlight-handle.png
index b7c6bbd..8993705 100644
Binary files a/images/C/using/dialog-highlight-handle.png and b/images/C/using/dialog-highlight-handle.png differ
diff --git a/images/C/using/dialog-highlight-imagemenu.png b/images/C/using/dialog-highlight-imagemenu.png
index 933be26..4fda68c 100644
Binary files a/images/C/using/dialog-highlight-imagemenu.png and b/images/C/using/dialog-highlight-imagemenu.png differ
diff --git a/images/C/using/dialog-highlight-tabmenu.png b/images/C/using/dialog-highlight-tabmenu.png
index f4779fa..153e464 100644
Binary files a/images/C/using/dialog-highlight-tabmenu.png and b/images/C/using/dialog-highlight-tabmenu.png differ
diff --git a/images/C/using/tab-menu-add-tab.png b/images/C/using/tab-menu-add-tab.png
index d0f957e..98621b3 100644
Binary files a/images/C/using/tab-menu-add-tab.png and b/images/C/using/tab-menu-add-tab.png differ
diff --git a/images/C/using/tab-menu.png b/images/C/using/tab-menu.png
index 78361d7..f41976a 100644
Binary files a/images/C/using/tab-menu.png and b/images/C/using/tab-menu.png differ
diff --git a/src/concepts/docks.xml b/src/concepts/docks.xml
index 849ec9e..65ecb0b 100644
--- a/src/concepts/docks.xml
+++ b/src/concepts/docks.xml
@@ -32,51 +32,51 @@
     </indexterm>
 
     <para>
-      <acronym>GIMP</acronym> offers a lot of flexibility about the
-arrangement
-      of dialog windows on your screen. Instead of placing each dialog in its
-      own window, you can group them together using docks. A "dock" is a
+      <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 image windows: each image always has its own
-      separate window. They also can't hold non-persistent dialogs, such as
-      the Preferences dialog or the New Image dialog.
+      cannot, however, hold non-persistent dialogs such as
+      the Preferences dialog or an Image window.
     </para>
     <para>
-      <acronym>GIMP</acronym> is now supplied with two docks:
+      <acronym>GIMP</acronym> has two default docks:
       <itemizedlist>
         <listitem>
           <para>
-            The Layers, Channels and Paths dock
+            The Layers, Channels and Paths dock.
           </para>
         </listitem>
         <listitem>
           <para>
-            The Brushes, Patterns and Gradients dock
+            The Brushes, Patterns and Gradients dock.
           </para>
         </listitem>
       </itemizedlist>
-      In these docks, every window is in its own tab.
+      In these docks, each window is in its own tab.
     </para>
     <para>
-      The Toolbox is now also a <emphasis>utility window</emphasis>. The
+      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.
     </para>
     <para>
-      A list of dockable windows is available in
+      Use 
       <menuchoice>
         <guimenu>Windows</guimenu>
-        <guisubmenu>Dockable Windows</guisubmenu>
+        <guisubmenu>Dockable Dialogs</guisubmenu>
       </menuchoice>.
-      Click on the name of one of them to open it as an independent window.
+      view a list of dockable dialogs. Choose 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 window has two types of docking areas: the docking bars
-      and the docking-tab area.
-      In an isolated window, the <emphasis>docking-tab area</emphasis> is
-      the same as the drag handle area (see below). In a dock, the
-      docking-tab area covers all the window.
+      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">
@@ -87,7 +87,7 @@ arrangement
             format="PNG"/>
         </imageobject>
         <caption>
-          <para>The dockable window has been docked onto a dock bar.</para>
+          <para>The dockable window is docked onto a dock bar.</para>
         </caption>
       </mediaobject>
       <mediaobject>
@@ -97,7 +97,7 @@ arrangement
         </imageobject>
         <caption>
           <para>
-            The dockable window has been docked onto the docking-tab area. A
+            The dockable window is docked onto the docking-tab area. A
             new tab has been created.
           </para>
         </caption>
@@ -115,7 +115,7 @@ arrangement
 
     <para>
       Each dockable window has two <emphasis>docking bars</emphasis>. These
-      bars are thin gray bars, very unobtrusive and easy not to notice: most
+      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>
@@ -145,20 +145,20 @@ arrangement
 
     <para>
       Each dockable window has a <emphasis>drag handle area</emphasis>,
-      as highlighted in the figure below. You can recognize this by
-      the fact that the cursor changes to a hand shape when the pointer is
-      over the drag handle area. To dock a dialog, you simply click on its
-      drag handle area, and drag it onto
+      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:
       <itemizedlist>
         <listitem>
           <para>
-            either one of the docking bars in a window: the dialog will be
-            attached under this window,
+            onto a docking bar so that the dialog is attached
+            below the docking bar in the window,
           </para>
         </listitem>
         <listitem>
           <para>
-            or the docking-tab area: the dialog will be added as a tab.
+            or into the docking-tab area so that the dialog is
+            added as a tab.
           </para>
         </listitem>
       </itemizedlist>
@@ -182,22 +182,25 @@ arrangement
 
     <para>
       You can drag more than one dialog onto the same docking bar. If you do,
-      they will turn into tabs, represented by iconic symbols at the top.
-      Clicking on the tab handle will bring a tab to the front, so that you
-      can interact with it.
+      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.
     </para>
 
     <note>
       <para>
-        You can also add a new tab in a window, detach it, delete it by using
-        the Tab menu. Please see below.
+        You can also add, detach, or delete a tab window
+        using the Tab menu (see below).
       </para>
     </note>
 
     <tip>
       <para>
-        Pressing <keycap>TAB</keycap> toggles the visibility of all present
-        docks.
+        Press <keycap>TAB</keycap> in an Image window to toggle the
+        visibility of the docks. This is useful if the docks hide a portion
+        of the image Window. You can quickly hide all the docks,
+        do your work, then display all the docs again.
+        Pressing <keycap>TAB</keycap> inside a dock to navigate
+        through the dock.
       </para>
     </tip>
   </sect3>
@@ -212,18 +215,20 @@ arrangement
     </indexterm>
     <para>
       Some docks contain an <emphasis>Image Menu</emphasis>:
-      a menu listing all of the images open in <acronym>GIMP</acronym>, and
-      displaying the name
-      of the image whose information is shown in the dock. You can use the
-      Image Menu to select a different image (don't confuse this menu for the
-      Image Menu that is the Menu of the active image on your screen). If the
-      <guilabel>Auto</guilabel> button is depressed, then the menu always
-      shows the name of <acronym>GIMP</acronym>'s currently active image, that
-      is, the image
-      you are currently working on.
+      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 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>
-      <title>A dock with an Image Menu highlighted</title>
+    <figure id="figure-highlight-imagemenu">
+      <title>A dock with an Image Menu highlighted.</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
@@ -234,8 +239,9 @@ arrangement
     <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 "Show
-      Image Menu" toggle in the Tab menu, as described below. (Exception: you
+      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>
@@ -249,7 +255,7 @@ arrangement
     </indexterm>
 
     <figure>
-      <title>A dialog in a dock, with the Tab menu button highlighted</title>
+      <title>A dialog in a dock, with the Tab menu button highlighted.</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
@@ -259,13 +265,13 @@ arrangement
     </figure>
     <para>
       In each dialog, you can access a special menu of tab-related operations
-      by pressing the Tab Menu button, as highlighted in the figure on the
-      right. Exactly which commands are shown in the menu varies a bit from
+      by pressing the Tab Menu button, as highlighted in the figure below.
+      Exactly which commands are shown in the menu varies a bit from
       dialog to dialog, but they always include operations for creating new
       tabs, or closing or detaching tabs.
     </para>
     <figure>
-      <title>Tab menu from the Layers dialog</title>
+      <title>Tab menu from the Layers dialog.</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/using/tab-menu.png" format="PNG"/>
@@ -281,14 +287,14 @@ arrangement
         <listitem>
           <indexterm>
             <primary>Docks</primary>
-            <secondary>Context menu</secondary>
+            <secondary>Context Menu</secondary>
           </indexterm>
           <para>
             At the top of each Tab menu is an entry that opens into the
             dialog's context menu, which contains operations specific to that
             particular type of dialog. For example, the context menu for the
-            Patterns dialog contains a set of operations for manipulating
-            patterns.
+            Layers tab is <guilabel>Layers Menu</guilabel>, which contains
+            a set of operations for manipulating layers.
           </para>
         </listitem>
       </varlistentry>
@@ -302,8 +308,8 @@ arrangement
             <secondary>Add Tab</secondary>
           </indexterm>
           <para>
-            This entry opens into a submenu allowing you to add a large
-            variety of dockable dialogs as new tabs.
+            <guilabel>Add Tab</guilabel> opens into a submenu allowing you to
+            add a large variety of dockable dialogs as new tabs.
           </para>
           <figure>
             <title><quote>Add tab</quote> sub-menu</title>
@@ -326,9 +332,8 @@ arrangement
             <secondary>Close tab</secondary>
           </indexterm>
           <para>
-            This entry closes the dialog. Closing the last dialog in a dock
-            causes the dock itself to close. Choosing this menu entry has the
-            same effect as pressing the "Close Tab" button.
+            Close the dialog. Closing the last dialog in a dock
+            causes the dock itself to close.
           </para>
         </listitem>
       </varlistentry>
@@ -342,7 +347,7 @@ arrangement
             <secondary>Detach tab</secondary>
           </indexterm>
           <para>
-            This entry detaches the dialog from the dock, creating a new dock
+            Detach the dialog from the dock, creating a new dock
             with the detached dialog as its only member. It has the same
             effect as dragging the tab out of the dock and releasing it at a
             location where it cannot be docked.
@@ -362,7 +367,7 @@ arrangement
             <secondary>Preview size</secondary>
           </indexterm>
           <figure id="figure-gimp-dock-preview-size">
-            <title>Preview Size submenu of a Tab menu</title>
+            <title>Preview Size submenu of a Tab menu.</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -392,7 +397,7 @@ arrangement
         <term>Tab Style</term>
         <listitem>
           <figure id="figure-gimp-dock-tab-style">
-            <title>Tab Style submenu of a Tab menu</title>
+            <title>Tab Style submenu of a Tab menu.</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -406,12 +411,12 @@ arrangement
             <secondary>Tab style</secondary>
           </indexterm>
           <para>
-            This entry is available when multiple dialogs are in the same
-            dock: it opens into a submenu allowing you to choose how the tabs
-            at the top will appear
+            Available only when multiple dialogs are in the same dock,
+            <guilabel>Tab Style</guilabel> opens a submenu allowing you
+            to choose the appearance of the tabs at the top 
             (cf. <xref linkend="figure-gimp-dock-tab-style"/>).
-            There are five choices, not all of which will be available for
-            all types of dialogs:
+            There are five choices, not all are available for every
+            dialog:
           </para>
           <para>
             <variablelist>
@@ -419,8 +424,7 @@ arrangement
                 <term>Icon</term>
                 <listitem>
                   <para>
-                    This choice gives you an icon representing the dialog
-                    type.
+                    Use an icon to represent the dialog type.
                   </para>
                 </listitem>
               </varlistentry>
@@ -428,10 +432,12 @@ arrangement
                 <term>Current Status</term>
                 <listitem>
                   <para>
-                    This choice is only available for dialogs that allows you
-                    to select something, such as a brush, a pattern, a
-                    gradient, etc. It gives you a tab showing a representation
-                    of the item currently selected.
+                    <guilabel>Current Status</guilabel>
+                    is only available for dialogs that allows you
+                    to select something, such as a brush, pattern, 
+                    gradient, etc. <guilabel>Current Status</guilabel>
+                    shows a representation of the currently selected
+                    item in the tab top.
                   </para>
                 </listitem>
               </varlistentry>
@@ -439,8 +445,7 @@ arrangement
                 <term>Text</term>
                 <listitem>
                   <para>
-                    This choice gives you a tab showing the dialog type in
-                    text.
+                    Use text to display the dialog type.
                   </para>
                 </listitem>
               </varlistentry>
@@ -448,8 +453,7 @@ arrangement
                 <term>Icon and Text</term>
                 <listitem>
                   <para>
-                    This choice gives you wider tabs, containing both an icon
-                    and the type of dialog in text.
+                    Using both an icon and text results in wider tabs.
                   </para>
                 </listitem>
               </varlistentry>
@@ -457,8 +461,8 @@ arrangement
                 <term>Status and Text</term>
                 <listitem>
                   <para>
-                    This choice, where available, shows the item currently
-                    selected, as well as the type of dialog.
+                    Show the currently selected, and text with the dialog
+                    type.
                   </para>
                 </listitem>
               </varlistentry>
@@ -477,30 +481,31 @@ arrangement
           </indexterm>
           <indexterm><primary>List search field</primary></indexterm>
           <para>
-            These entries are shown in dialogs that allows you to select an
+            These entries are shown in dialogs that allow you to select an
             item from a set: brushes, patterns, fonts, etc. You can choose
-            whether to view the items as a vertical list, with the name of
+            to view the items as a vertical list, with the name of
             each beside it, or as a grid, with representations of the items
             but no names. Each has its advantages: viewing as a list gives you
-            more information, but viewing as a grid allows you to see many
+            more information, but viewing as a grid allows you to see 
             more possibilities at once. The default for this varies across
             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 <quote>as list</quote>, pressing
+              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.
+              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>
+            <title>The list search field.</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -508,33 +513,56 @@ arrangement
               </imageobject>
               <caption>
                 <para>
-                  The list search field you get pressing
-                  <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>.
+                  Use
+                  <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>
+                  to open the list search field.
                 </para>
               </caption>
             </mediaobject>
           </figure>
           <para>
-            This search field lasts five seconds only if you do nothing.
+            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
               get in the <quote>Brush</quote>, <quote>Font</quote> or
-              <quote>Pattern </quote> option of several tools.
+              <quote>Pattern</quote> option of several tools.
             </para>
           </note>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>Show Image Menu</term>
+        <term>Show Button Bar</term>
+        <listitem>
+          <para>
+            Some dialogs display a button bar on the bottom of the dialog; for
+            example, the Patterns, Brushes, Gradients, and Images dialogs.
+            This is a toggle. If it is checked, then the Button Bar is
+            displayed.
+          </para>
+          <figure>
+            <title>Button Bar on the Brushes dialog.</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata format="PNG"
+                           fileref="images/using/dialog-button-bar.png"/>
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Show Image Selection</term>
         <listitem>
           <para>
             This is a toggle. If it is checked, then an Image Menu is shown at
-            the top of the dock. It is not available for dialogs docked below
-            the Toolbox. Don't confuse this menu with the Image Menu, that is
-            the menu of the active image on your screen.
+            the top of the dock
+            (see <xref linkend="figure-highlight-imagemenu"/>).
+            It is not available for dialogs docked below the Toolbox.
           </para>
         </listitem>
       </varlistentry>
@@ -543,11 +571,10 @@ arrangement
         <term>Auto Follow Active Image</term>
         <listitem>
           <para>
-            If this option is checked, the related dialog will be that of the
-            current image and will change if you select another image. For
-            example, if you have two images and the Histogram dialog on your
-            screen (and this option checked in this dialog), then the
-            histogram of the activated image will be displayed.
+            <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>
diff --git a/src/concepts/imagewindow.xml b/src/concepts/imagewindow.xml
index 840b156..ba912fe 100644
--- a/src/concepts/imagewindow.xml
+++ b/src/concepts/imagewindow.xml
@@ -283,4 +283,13 @@
       </para>
     </listitem>
   </orderedlist>
+  <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.
+    </para>
+  </tip>  
 </sect2>
diff --git a/src/concepts/toolbox.xml b/src/concepts/toolbox.xml
index 2195cef..ab13b6d 100644
--- a/src/concepts/toolbox.xml
+++ b/src/concepts/toolbox.xml
@@ -124,4 +124,13 @@
       visible when you do not have an open image.
     </para>
   </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.
+    </para>
+  </tip>
 </sect2>



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