Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2022-02-22 23:14:10 +01:00
commit a9661efe2b
12 changed files with 275 additions and 56 deletions

View file

@ -7,7 +7,7 @@
https://tuxpaint.org/
@TuxPaintTweets on Twitter
January 26, 2022
February 21, 2022
----------------------------------------------------------------------
@ -406,9 +406,12 @@ Available Tools
"Text" and "Label" Tools
Choose a font (from the 'Letters' available on the right)
and a color (from the color palette near the bottom). Click
on the screen and a cursor will appear. Type text and it
will show up on the screen.
and a color (from the color palette near the bottom). You
may also apply a bold, and/or an italic styling effect to
the text. Click on the screen and a cursor will appear. Type
text and it will show up on the screen. (You can change the
font, color, and styling while entering the text, before it
is applied to the canvas.)
Press [Enter] or [Return] and the text will be drawn onto
the picture and the cursor will move down one line.
@ -441,6 +444,29 @@ Available Tools
This allows the label to be repositioned or
edited later.
To edit a label, click the label selection
button. All labels in the drawing will appear
highlighted. Click one — or use the [Tab] key
to cycle through all the labels, and the
[Enter] or [Return] key to select one — and you
may then edit the label. (Use they [Backspace]
key to erase characters, and other keys to add
text to the label; click in the canvas to
reposition the label; click in the palette to
change the color of the text in the label;
etc.)
You may "apply" a label to the canvas, painting
the text into the picture as if it had been
added using the Text tool, by clicking the
label application button. (This feature was
added in Tux Paint version 0.9.28.) All labels
in the drawing will appear highlighted, and you
select one just as you do when selecting a
label to edit. The chosen label will be
removed, and the text will be added directly to
the canvas.
The Label tool can be disabled (e.g., by
selecting "Disable 'Label' Tool" in Tux Paint
Config. or running Tux Paint with the "nolabel"

View file

@ -29,7 +29,7 @@
</p>
<p>
January 26, 2022 </p>
February 21, 2022 </p>
</center>
<hr size="2"
@ -641,7 +641,7 @@
alt=""
align="right">
<p>
Choose a font (from the 'Letters' available on the right) and a color (from the color palette near the bottom). Click on the screen and a cursor will appear. Type text and it will show up on the screen. </p>
Choose a font (from the 'Letters' available on the right) and a color (from the color palette near the bottom). You may also apply a bold, and/or an italic styling effect to the text. Click on the screen and a cursor will appear. Type text and it will show up on the screen. (You can change the font, color, and styling while entering the text, before it is applied to the canvas.) </p>
<p>
Press <b><code>[Enter]</code></b> or <b><code>[Return]</code></b> and the text will be drawn onto the picture and the cursor will move down one line. </p>
@ -671,6 +671,12 @@
<p>
When using the <strong>Label</strong> tool (which was added to Tux Paint in version 0.9.22), the text 'floats' over the image, and the details of the label (the text, the position of the label, the font choice and the color) get stored separately. This allows the label to be repositioned or edited later. </p>
<p>
To edit a label, click the label selection button. All labels in the drawing will appear highlighted. Click one &mdash; or use the <strong><code>[Tab]</code></strong> key to cycle through all the labels, and the <strong><code>[Enter]</code></strong> or <strong><code>[Return]</code></strong> key to select one &mdash; and you may then edit the label. (Use they <strong><code>[Backspace]</code></strong> key to erase characters, and other keys to add text to the label; click in the canvas to reposition the label; click in the palette to change the color of the text in the label; etc.) </p>
<p>
You may "apply" a label to the canvas, painting the text into the picture as if it had been added using the <strong>Text</strong> tool, by clicking the label application button. (This feature was added in Tux Paint version 0.9.28.) All labels in the drawing will appear highlighted, and you select one just as you do when selecting a label to edit. The chosen label will be removed, and the text will be added directly to the canvas. </p>
<p>
The <strong>Label</strong> tool can be disabled (e.g., by selecting "Disable 'Label' Tool" in <em>Tux Paint Config.</em> or running <em>Tux Paint</em> with the "<code>nolabel</code>" option). </p>
</dd>