[gimp-help-2] Rename Brush and Painting tools
- From: Ulf-D. Ehlert <ulfehlert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-help-2] Rename Brush and Painting tools
- Date: Sun, 7 Mar 2010 13:03:07 +0000 (UTC)
commit 7792c79d208c6832453b4c5c68a11dee5a213efa
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date: Wed Mar 3 20:14:30 2010 +0100
Rename Brush and Painting tools
* Rename "Brush tools" to "Paint tools", the menu name in the Tools menu.
* Rename "Painting tools" to "Brush tools" (basic painting tools: Pencil,
Paintbrush, Airbrush) to avoid the confusion "Paint" vs. "Painting" tools.
src/concepts/layer-modes.xml | 2 +-
src/filters/alpha-to-logo/glossy.xml | 4 +-
src/toolbox/about-common-brush-options.xml | 8 +-
src/toolbox/about-common-painting-options.xml | 10 ++--
src/toolbox/tool-brush.xml | 96 +++++++++++--------------
src/toolbox/tool-clone.xml | 4 +-
src/toolbox/tool-convolve.xml | 15 +++--
src/toolbox/tool-eraser.xml | 2 +-
src/toolbox/tools-paint.xml | 29 +++++++-
src/toolbox/tools-painting.xml | 35 ++++++++--
src/using/simpleobjects.xml | 4 +-
11 files changed, 123 insertions(+), 86 deletions(-)
---
diff --git a/src/concepts/layer-modes.xml b/src/concepts/layer-modes.xml
index 28bc6d7..b6f3dea 100644
--- a/src/concepts/layer-modes.xml
+++ b/src/concepts/layer-modes.xml
@@ -50,7 +50,7 @@
modes that affect the painting tools in a similar way to the layer
modes. You can use all of the same modes for painting that are available
for layers, and there are two additional modes just for the painting
- tools. See <xref linkend="gimp-tool-painting"/>.
+ tools. See <xref linkend="gimp-tools-brush"/>.
</para>
</note>
<para>
diff --git a/src/filters/alpha-to-logo/glossy.xml b/src/filters/alpha-to-logo/glossy.xml
index 1ef11d7..5f3a588 100644
--- a/src/filters/alpha-to-logo/glossy.xml
+++ b/src/filters/alpha-to-logo/glossy.xml
@@ -158,7 +158,7 @@
<para>
When checked, the original, not enlarged alpha of the outline
layer will be filled with the specified pattern using the overlay
- <link linkend="gimp-tool-brush-options">mode</link>, so that the
+ <link linkend="gimp-tools-paint-options">mode</link>, so that the
pattern and the previous contents (pattern or gradient) will be
merged.
</para>
@@ -248,7 +248,7 @@
<para>
The last (optional) step is to fill the outline layer with a pattern,
using the <quote>overlay</quote> layer
- <link linkend="gimp-tool-brush-options">mode</link>. This will combine
+ <link linkend="gimp-tools-paint-options">mode</link>. This will combine
the pattern with the pattern or gradient used before. To learn more
about the result of using the overlay mode, see the description in
<xref linkend="gimp-concepts-layer-modes"/>.
diff --git a/src/toolbox/about-common-brush-options.xml b/src/toolbox/about-common-brush-options.xml
index 211a700..c67a65a 100644
--- a/src/toolbox/about-common-brush-options.xml
+++ b/src/toolbox/about-common-brush-options.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!--
This file is meant to be included by the painting tools files:
src/toolbox/tool-{pencil, paintbrush, eraser, airbrush, ink, clone,
@@ -7,8 +8,7 @@
-->
<note>
<para>
- See the <link linkend="gimp-tool-brush-options">Brush Tools
- Overview</link> for a description of tool options that apply to many or
- all brush tools.
+ See the <link linkend="gimp-tools-paint-options">Paint Tool Options</link>
+ for a description of tool options that apply to many or all paint tools.
</para>
</note>
diff --git a/src/toolbox/about-common-painting-options.xml b/src/toolbox/about-common-painting-options.xml
index e392b72..b80d8ef 100644
--- a/src/toolbox/about-common-painting-options.xml
+++ b/src/toolbox/about-common-painting-options.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!--
- This file is meant to be included by the painting tools files:
+ This file is meant to be included by the brush tools files:
src/toolbox/tool-{pencil,paintbrush,ink}.xml.
-->
<note>
<para>
- See the <link linkend="gimp-tool-painting">Painting Tools Overview</link>
- for a description of tool options that apply to many or all painting
- tools.
+ See <xref linkend="gimp-tools-brush"/> for a description of tool options
+ that apply to all brush tools.
</para>
</note>
diff --git a/src/toolbox/tool-brush.xml b/src/toolbox/tool-brush.xml
index cf29e88..34c2f82 100644
--- a/src/toolbox/tool-brush.xml
+++ b/src/toolbox/tool-brush.xml
@@ -19,26 +19,10 @@
<sect2 id="gimp-tool-brush">
<title>Common Features</title>
- <indexterm>
- <primary>Paint Tools</primary>
- </indexterm>
- <indexterm>
- <primary>Toolbox</primary>
- <secondary>Brush Tools</secondary>
- </indexterm>
-
- <figure>
- <title>The Paint Tools (Tools menu)</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/toolbox/brush-tools.png" format="PNG"/>
- </imageobject>
- </mediaobject>
- </figure>
-
<para>
- The GIMP Toolbox includes thirteen <quote>brush tools</quote>,
- all grouped together at the bottom (in the default arrangement).
+ The <acronym>GIMP</acronym> Toolbox includes thirteen <quote>paint
+ tools</quote>, all grouped together at the bottom (in the default
+ arrangement).
</para>
<figure>
<title>The Paint Tools (Tools Box)</title>
@@ -77,8 +61,13 @@
</itemizedlist>
<para>
- behave like the intuitive notion of "painting" with a brush. The others
- use a brush to modify an image in some way rather than paint on it:
+ behave like the intuitive notion of <quote>painting</quote> with a brush.
+ Pencil, Paintbrush, and Airbrush are called <quote>basic painting
+ tools</quote> or <link linkend="gimp-tools-brush">brush tools</link>.
+ </para>
+ <para>
+ The other tools use a brush to modify an image in some way rather than
+ paint on it:
</para>
<itemizedlist>
<listitem>
@@ -144,16 +133,16 @@
</para>
<para>
In addition to the more common <quote>hands-on</quote> method, it is
- possible to apply brush tools in an automated way, by creating a selection
+ possible to apply paint tools in an automated way, by creating a selection
or path and then <quote>stroking</quote> it. You can choose to stroke
- with any of the brush tools, including nonstandard ones such as the
+ with any of the paint tools, including nonstandard ones such as the
Eraser, Smudge tool, etc., and any options you set for the tool will be
applied. See the section on
<link linkend="gimp-selection-stroke">Stroking</link> for more
information.
</para>
- <sect3 id="gimp-tools-brush-modifiers">
+ <sect3 id="gimp-tools-paint-modifiers">
<title>Key modifiers</title>
<variablelist>
<varlistentry>
@@ -163,17 +152,16 @@
<listitem>
<para>
Holding down the <keycap>Ctrl</keycap> key has a special effect on
- every brush tool. For the Pencil, Paintbrush, Airbrush, Ink Tool,
- and Eraser tools, it switches them into <quote>color
- picker</quote> mode, so that clicking on an image pixel causes
- <acronym>GIMP</acronym>'s foreground to be set to the active
- layer's color at that point (or, for the Eraser,
- <acronym>GIMP</acronym>'s background color). For the Clone tool,
- the <keycap>Ctrl</keycap> key switches it into a mode where
- clicking sets the reference point for copying. For the Convolve
- tool, the <keycap>Ctrl</keycap> key switches between blur and
- sharpen modes; for the Dodge/Burn tool, it switches between
- dodging and burning.
+ every paint tool. For the Pencil, Paintbrush, Airbrush, Ink, and
+ Eraser, it switches them into <quote>color picker</quote> mode, so
+ that clicking on an image pixel causes <acronym>GIMP</acronym>'s
+ foreground to be set to the active layer's color at that point
+ (or, for the Eraser, <acronym>GIMP</acronym>'s background color).
+ For the Clone tool, the <keycap>Ctrl</keycap> key switches it into
+ a mode where clicking sets the reference point for copying. For
+ the Convolve tool, the <keycap>Ctrl</keycap> key switches between
+ blur and sharpen modes; for the Dodge/Burn tool, it switches
+ between dodging and burning.
</para>
</listitem>
</varlistentry>
@@ -187,9 +175,9 @@
<primary>Straight Line</primary>
</indexterm>
<para>
- Holding down the Shift key has the same effect on all brush tools:
- it places the tool into <emphasis>straight line</emphasis>
- mode. To create a straight line with any of the brush tools, first
+ Holding down the Shift key has the same effect on most paint
+ tools: it places the tool into <emphasis>straight line</emphasis>
+ mode. To create a straight line with any of the paint tools, first
click on the starting point, <emphasis>then</emphasis>
press the Shift key. As long as you hold it down, you will see a
thin line connecting the previously clicked point with the current
@@ -222,10 +210,10 @@
</variablelist>
</sect3>
- <sect3 id="gimp-tool-brush-options">
+ <sect3 id="gimp-tools-paint-options">
<title>Tool Options</title>
<figure>
- <title>Tool Options shared by all brush tools</title>
+ <title>Tool options shared by paint tools</title>
<mediaobject>
<imageobject>
<imagedata format="PNG"
@@ -235,7 +223,7 @@
</figure>
<para>
- Many tool options are shared by several brush tools: these are described
+ Many tool options are shared by several paint tools: these are described
here. Options that apply only to one specific
tool, or to a small number of tools, are described in the sections
devoted to those tools.
@@ -254,7 +242,7 @@
of special effects in this way. The Mode option is only usable
for tools that can be thought of as adding color to the image:
the Pencil, Paintbrush, Airbrush, Ink, and Clone tools. For the
- other brush tools, the option appears for the sake of
+ other paint tools, the option appears for the sake of
consistency but is always grayed out. A list of modes can be
found in <xref linkend="gimp-concepts-layer-modes"/>.
</para>
@@ -284,7 +272,7 @@
the Tool Options has the same effect that changing opacity in the
Layers dialog would have in the latter situation. It controls the
<quote>strength</quote>
- of all brush tools, not just those that paint on the active layer.
+ of all paint tools, not just those that paint on the active layer.
In the case of the Eraser, this can come across as a bit
confusing: it works out that the higher the <quote>opacity</quote>
is, the more transparency you get.
@@ -300,11 +288,11 @@
with the pointer. <acronym>GIMP</acronym> allows you to use
several different types of brushes, which are described in the
<link linkend="gimp-concepts-brushes">Brushes</link>
- section. The same brush choices are available for all brush tools
+ section. The same brush choices are available for all paint tools
except the Ink tool, which uses a unique type of procedurally
generated brush. The colors of a brush only come into play for
tools where they are meaningful: the Pencil, Paintbrush, and
- Airbrush tools. For the other brush tools, only the intensity
+ Airbrush tools. For the other paint tools, only the intensity
distribution of a brush is relevant.
</para>
</listitem>
@@ -398,7 +386,7 @@
<term>Size</term>
<listitem>
<para>
- This option applies to all of the pressure sensitive brush
+ This option applies to all of the pressure sensitive paint
tools. If the option is checked, then pressing harder will
increase the size of the area affected by the brush.
</para>
@@ -408,7 +396,7 @@
<term>Color</term>
<listitem>
<para>
- This option only applies to the painting tools: the Pencil,
+ This option only applies to the brush tools: the Pencil,
Paintbrush, and Airbrush; and only if you are using colors
from a gradient. If these conditions are met, then pressing
harder causes colors to be taken from higher in the
@@ -425,11 +413,11 @@
<listitem>
<para>
This option causes each stroke to fade out over the specified
- distance. It is easiest to visual for painting tools, but applies
- to all of the brush tools. It is equivalent to gradually reducing
- the opacity along the trajectory of the stroke. Note that, if you
- are using a tablet, this option does not change the effects of
- brush pressure.
+ distance. It is easiest to visual for <quote>real</quote> painting
+ tools, and applies to all of the brush tools. It is equivalent to
+ gradually reducing the opacity along the trajectory of the stroke.
+ Note that, if you are using a tablet, this option does not change
+ the effects of brush pressure.
</para>
</listitem>
</varlistentry>
@@ -473,7 +461,7 @@
the same spot will not increase the effect beyond this limit. If
Incremental is active, each additional pass with the brush will
increase the effect, but the opacity can't exceed the opacity set
- for the tool. This option is available for all brush tools except
+ for the tool. This option is available for all paint tools except
those which have a <quote>rate</quote>
control, which automatically implies an incremental effect. See
also <xref linkend="gimp-concepts-layer-modes"/>.
@@ -847,7 +835,7 @@
<sect3>
<title>Further Information</title>
<para>
- Advanced users may be interested to know that brush tools actually
+ Advanced users may be interested to know that paint tools actually
operate at a sub-pixel level, in order to avoid producing jagged-looking
results. One consequence of this is that even if you work with a
hard-edged brush, such as one of the Circle brushes, pixels on the edge
diff --git a/src/toolbox/tool-clone.xml b/src/toolbox/tool-clone.xml
index 434b2a3..0b1737c 100644
--- a/src/toolbox/tool-clone.xml
+++ b/src/toolbox/tool-clone.xml
@@ -108,9 +108,9 @@
<sect3>
<title>Key modifiers (default)</title>
<para>
- See the <link linkend="gimp-tools-brush-modifiers">Brush tools key
+ See the <link linkend="gimp-tools-paint-modifiers">Paint tools key
modifiers</link> for a description of key modifiers that have the same
- effect on all brush tools.
+ effect on all paint tools.
</para>
<variablelist>
diff --git a/src/toolbox/tool-convolve.xml b/src/toolbox/tool-convolve.xml
index 20a3988..89e8f66 100644
--- a/src/toolbox/tool-convolve.xml
+++ b/src/toolbox/tool-convolve.xml
@@ -108,13 +108,14 @@
<sect3>
<title>Key modifiers (Defaults)</title>
<para>
- See the <link linkend="gimp-tool-brush">Brush Tools
- Overview</link> for a description of key modifiers that have the
- same effect on all brush tools.
+ See the <link linkend="gimp-tool-brush">Paint Tools' Common
+ Features</link> for a description of key modifiers that have the same
+ effect on all paint tools.
</para>
<itemizedlist>
<listitem>
- <para><keycap>Ctrl</keycap>:
+ <para>
+ <keycap>Ctrl</keycap>:
Holding down the Ctrl key toggles between Blur and Sharpen
modes; it reverses the setting shown in the Tool Options.
</para>
@@ -149,7 +150,8 @@
<varlistentry>
<term>Convolve Type</term>
<listitem>
- <para><emphasis>Blur</emphasis>
+ <para>
+ <emphasis>Blur</emphasis>
mode causes each pixel affected by the brush to be blended with
neighboring pixels, thereby increasing the similarity of pixels
inside the brushstroke area. <emphasis>Sharpen</emphasis>
@@ -159,7 +161,8 @@
aspect. Whatever setting you choose here, you can
reverse it on-the-fly by holding down the Ctrl key.
</para>
- <para><quote>Convolve</quote> refers to a mathematical method using
+ <para>
+ <quote>Convolve</quote> refers to a mathematical method using
matrices.
</para>
</listitem>
diff --git a/src/toolbox/tool-eraser.xml b/src/toolbox/tool-eraser.xml
index 211394d..bef0f8a 100644
--- a/src/toolbox/tool-eraser.xml
+++ b/src/toolbox/tool-eraser.xml
@@ -129,7 +129,7 @@
<title>Key modifiers</title>
<para>
See the <xref linkend="gimp-tool-brush"/> for a description of key
- modifiers that have the same effect on all brush tools.
+ modifiers that have the same effect on all paint tools.
</para>
<variablelist>
<varlistentry>
diff --git a/src/toolbox/tools-paint.xml b/src/toolbox/tools-paint.xml
index 0a66483..89c206c 100644
--- a/src/toolbox/tools-paint.xml
+++ b/src/toolbox/tools-paint.xml
@@ -2,13 +2,36 @@
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2010-03-03 ude: renamed according to menu item
2008-03-12 Mr.Dust : added korean contents
2007-06-15 kost: added norwegian
- 20050817 axel.wernicke relocated blend from other tools
- 20050815 axel.wernicke relocated bucket fill from other tools
+ 2005-08-17 axel.wernicke relocated blend from other tools
+ 2005-08-15 axel.wernicke relocated bucket fill from other tools
-->
<sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tools-paint">
- <title>Brush Tools</title>
+ <title>Paint Tools</title>
+
+ <indexterm>
+ <primary>Paint Tools</primary>
+ </indexterm>
+ <indexterm>
+ <primary>Tools</primary>
+ <secondary>Paint</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Toolbox</primary>
+ <secondary>Paint Tools</secondary>
+ </indexterm>
+
+ <figure>
+ <title>The Paint Tools (Tools menu)</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/toolbox/brush-tools.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<xi:include href="tool-brush.xml"/>
<xi:include href="tools-painting.xml"/>
<xi:include href="tool-bucket-fill.xml"/>
diff --git a/src/toolbox/tools-painting.xml b/src/toolbox/tools-painting.xml
index ffc2c09..03c9730 100644
--- a/src/toolbox/tools-painting.xml
+++ b/src/toolbox/tools-painting.xml
@@ -2,6 +2,7 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!--Section History
+ 2010-03-03 ude: renamed: Painting tools -> Brush tools
2008-03-15 Mr.Dust : added korean contents
2008-01-14 PP reviewed for fr
2007-10-07 lexa: reviewed de for GIMP 2.4
@@ -9,12 +10,19 @@
2007-06-17 kost: added norwegian
2007-01-13 lexa: enhanced docbook compliance
-->
-<sect2 id="gimp-tool-painting">
- <title>Painting Tools (Pencil, Paintbrush, Airbrush)</title>
+<!-- XXX: do we really need this file or should we merge it with
+ the "common features" section? -->
+<sect2 id="gimp-tools-brush">
+ <!-- "Painting tools" would be confused with "Paint tools" (tools menu) -->
+ <title>Brush Tools (Pencil, Paintbrush, Airbrush)</title>
<indexterm>
<primary>Tools</primary>
- <secondary>Painting</secondary>
+ <secondary>Paint</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Tools</primary>
+ <secondary>Brush</secondary>
</indexterm>
<figure>
@@ -35,9 +43,10 @@
</figure>
<para>
- The tools in this group are GIMP's basic painting tools, and they have
- enough features in common to be worth discussing together in this section.
- Features common to all brush tools are described in the
+ The tools in this group are <acronym>GIMP</acronym>'s basic painting
+ tools, and they have enough features in common to be worth discussing
+ together in this section. Features common to all paint tools are
+ described in the
<link linkend="gimp-tool-brush">Common Features</link>
section. Features specific to an individual tool are described in the
section devoted to that tool.
@@ -73,6 +82,20 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <keycap>Shift</keycap>
+ </term>
+ <listitem>
+ <para>
+ This key places these tools into straight line mode. Holding
+ <keycap>Shift</keycap> while clicking
+ <mousebutton>Button 1</mousebutton> will generate a straight
+ line. Consecutive clicks will continue drawing straight lines that
+ originate from the end of the last line.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</sect3>
</sect2>
diff --git a/src/using/simpleobjects.xml b/src/using/simpleobjects.xml
index cd55349..10743c7 100644
--- a/src/using/simpleobjects.xml
+++ b/src/using/simpleobjects.xml
@@ -42,7 +42,7 @@
<para>
Let's begin by painting a straight line. The easiest way to create a
straight line is by using your favorite
- <link linkend="gimp-tool-painting">painting tool</link>, the mouse and
+ <link linkend="gimp-tools-brush">brush tool</link>, the mouse and
the keyboard.
</para>
@@ -65,7 +65,7 @@
<para>
Create a <link linkend="gimp-file-new">new image</link>.
Select your favorite
- <link linkend="gimp-tool-painting">painting tool</link> or use the
+ <link linkend="gimp-tools-brush">brush tool</link> or use the
<link linkend="gimp-tool-pencil">pencil</link>, if in doubt.
Select a <link linkend="gimp-toolbox-color-area">foreground
color</link>, but be sure that the foreground and background
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
