diff --git a/Makefile b/Makefile index e09c80b6d..620f45fc5 100644 --- a/Makefile +++ b/Makefile @@ -543,8 +543,8 @@ trans: ###### windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n -macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion -ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion +macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg +ios_ARCH_INSTALL:=install-iosbundle linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) diff --git a/data/brushes/flower_5.dat b/data/brushes/flower_5.dat new file mode 100644 index 000000000..582a2f6fb --- /dev/null +++ b/data/brushes/flower_5.dat @@ -0,0 +1 @@ +spacing=45 diff --git a/data/brushes/flower_5_small.dat b/data/brushes/flower_5_small.dat new file mode 100644 index 000000000..3903bcc29 --- /dev/null +++ b/data/brushes/flower_5_small.dat @@ -0,0 +1 @@ +spacing=20 diff --git a/data/brushes/flower_6.dat b/data/brushes/flower_6.dat new file mode 100644 index 000000000..582a2f6fb --- /dev/null +++ b/data/brushes/flower_6.dat @@ -0,0 +1 @@ +spacing=45 diff --git a/data/brushes/flower_6_small.dat b/data/brushes/flower_6_small.dat new file mode 100644 index 000000000..3903bcc29 --- /dev/null +++ b/data/brushes/flower_6_small.dat @@ -0,0 +1 @@ +spacing=20 diff --git a/data/brushes/flower_7.dat b/data/brushes/flower_7.dat new file mode 100644 index 000000000..582a2f6fb --- /dev/null +++ b/data/brushes/flower_7.dat @@ -0,0 +1 @@ +spacing=45 diff --git a/data/brushes/heart.dat b/data/brushes/heart.dat new file mode 100644 index 000000000..bffe673c9 --- /dev/null +++ b/data/brushes/heart.dat @@ -0,0 +1 @@ +spacing=50 diff --git a/data/brushes/sphere.dat b/data/brushes/sphere.dat new file mode 100644 index 000000000..297b74997 --- /dev/null +++ b/data/brushes/sphere.dat @@ -0,0 +1 @@ +spacing=40 diff --git a/data/brushes/star.dat b/data/brushes/star.dat new file mode 100644 index 000000000..582a2f6fb --- /dev/null +++ b/data/brushes/star.dat @@ -0,0 +1 @@ +spacing=45 diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 23aa42876..ff0b4f5b1 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -2,13 +2,31 @@ CHANGES.txt for Tux Paint Tux Paint - A simple drawing program for children. -Copyright (c) 2002-2021 +Copyright (c) 2002-2022 Various contributors (see below, and AUTHORS.txt) http://www.tuxpaint.org/ -$Id$ -2021.December.1 (0.9.28) +2022.January.20 (0.9.28) + * Improvements to "Paint" and "Lines" tools: + ------------------------------------------ + * Brush spacing may now be altered within Tux Paint. + + Note: A "nobrushspacing" simplifcation option is provided to + disable this feature; Tux Paint will continue using the brushes' + default spacings. + + * Many brushes have been given more reasonable default spacing + settings (e.g., star brush's new default spacing causes + individual stars to appear, rather than a 'smear'). + Closes https://sourceforge.net/p/tuxpaint/bugs/243/ + (h/t Areti Tsolakidou for the suggestion) + + * Improvements to "Eraser" tool: + ------------------------------ + * Outline for circle-shaped erasers is now also circular. + Closes https://sourceforge.net/p/tuxpaint/bugs/244/ + (h/t Areti Tsolakidou for the suggestion) + * Localization Updates: --------------------- * Albanian translation @@ -20,14 +38,30 @@ $Id$ * Updated `src/po/check_translations.sh` sanity-checking script so it properly finds the updated docs & other changes. - * Ports & Building - ---------------- + * Bug Fixes: + ---------- + * Fixed abnormal exit of threaded font scan which prevented enabling + text/label tools on some environment such as Rocky Linux 8. + TOYAMA Shin-ichi + + * Ports & Building: + ----------------- * Windows installer forces to uninstall before the installation if version 0.9.27 and older is found. - * Windows installer does not show a dialogue to inform uninstallation - when "/VERYSILANT" switch is specified. + + * Windows installer will no longer show a dialogue to inform + user of uninstallation when "/VERYSILENT" switch is specified + (useful for automated installation/uninsta$llation processes). TOYAMA Shin-ichi + * Use character class in macOS build script + (It appears \t is not compatible with certain versions of grep.) + Mark K. Kim + + * Remove install stages not needed on macOS + Mark K. Kim + + 2021.November.25 (0.9.27) * New Magic Tools: ---------------- diff --git a/docs/en/ADVANCED-STAMPS-HOWTO.txt b/docs/en/ADVANCED-STAMPS-HOWTO.txt index 110a148c0..19365fab5 100644 --- a/docs/en/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/en/ADVANCED-STAMPS-HOWTO.txt @@ -1,10 +1,10 @@ Tux Paint version 0.9.28 Advanced Stamps 'How-To' - Copyright © 2006-2021 by Albert Cahalan and others; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan and others; see AUTHORS. + https://tuxpaint.org/ - August 29, 2021 + January 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/en/ENVVARS.txt b/docs/en/ENVVARS.txt index e8c42193f..1ce84385c 100644 --- a/docs/en/ENVVARS.txt +++ b/docs/en/ENVVARS.txt @@ -2,10 +2,10 @@ version 0.9.28 Environment Variables Documentation - Copyright © 2021-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - August 8, 2021 + January 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/en/EXTENDING.txt b/docs/en/EXTENDING.txt index 045e2f5f0..561b77a63 100644 --- a/docs/en/EXTENDING.txt +++ b/docs/en/EXTENDING.txt @@ -2,10 +2,10 @@ Tux Paint version 0.9.28 - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - September 19, 2021 + January 20, 2022 ---------------------------------------------------------------------- @@ -679,15 +679,15 @@ Translations template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: - http://www.tuxpaint.org/download/source/git/), and on the Tux Paint - website at http://www.tuxpaint.org/help/po/. + https://tuxpaint.org/download/source/git/), and on the Tux Paint website + at https://tuxpaint.org/help/po/. To edit an existing translation, download the latest ".po" file for that language, and edit it as described above. You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to - the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/). + the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/). Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access diff --git a/docs/en/FAQ.txt b/docs/en/FAQ.txt index 82ef3612b..71f9a90b6 100644 --- a/docs/en/FAQ.txt +++ b/docs/en/FAQ.txt @@ -1,10 +1,10 @@ Tux Paint version 0.9.28 Frequently Asked Questions - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - August 29, 2021 + January 20, 2022 ---------------------------------------------------------------------- @@ -170,7 +170,7 @@ Interface Problems The appropriate fonts for such locales can be downloaded from the Tux Paint website: - http://www.tuxpaint.org/download/fonts/ + https://tuxpaint.org/download/fonts/ ---------------------------------------------------------------------- @@ -637,7 +637,7 @@ Help / Contact Any questions you don't see answered? Please let us know! You can subscribe and post to our "tuxpaint-users" mailing list: - http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/ Or, contact lead developer Bill Kendrick directly: diff --git a/docs/en/INSTALL.txt b/docs/en/INSTALL.txt index 4146acc02..f790319cf 100644 --- a/docs/en/INSTALL.txt +++ b/docs/en/INSTALL.txt @@ -2,10 +2,10 @@ version 0.9.28 Installation Documentation - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - September 17, 2021 + January 20, 2022 ---------------------------------------------------------------------- @@ -637,11 +637,11 @@ Compiling and Installation installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg. + $ sudo port install rust cargo $ git clone https://github.com/ImageOptim/libimagequant.git - $ cd libimagequant - $ ./configure --prefix=/opt/local - $ make - $ sudo make install + $ cd libimagequant/imagequant-sys + $ cargo build --release + $ sudo make PREFIX=/opt/local install WARNING: Having any UNIX-like toolset installed on your Mac besides MacPorts and Xcode, such as Fink or Brew, will prevent your app diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt index 4227892d3..f179f87af 100644 --- a/docs/en/OPTIONS.txt +++ b/docs/en/OPTIONS.txt @@ -3,10 +3,10 @@ Options Documentation - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - August 29, 2021 + January 20, 2022 ---------------------------------------------------------------------- @@ -454,6 +454,21 @@ Simplification "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label". + nobrushspacing=yes + + Disables the brush spacing option of the Paint and Lines + tools. The brushes' default spacings will be used. + + Note: The brush spacing option was added to Tux Paint's user + interface in version 0.9.28. For more information on brush + spacing, see EXTENDING.html + + Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "nobrushspacing=no" or "brushspacing=yes". In both cases, + may be overridden by the command-line option + "--brushspacing". + ---------------------------------------------------------------------- Languages @@ -1960,7 +1975,7 @@ Special Fonts /usr/share/tuxpaint/fonts/locale/ko.ttf You can download fonts for supported languages from Tux Paint's - website, http://www.tuxpaint.org/. (Look in the 'Fonts' section under + website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.') Under Unix and Linux, you can use the Makefile that comes with the diff --git a/docs/en/PNG.txt b/docs/en/PNG.txt index bfbaefe50..c1fdeb975 100644 --- a/docs/en/PNG.txt +++ b/docs/en/PNG.txt @@ -2,10 +2,10 @@ version 0.9.28 PNG Documentation - Copyright © 2007-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - March 9, 2021 + January 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/en/README.txt b/docs/en/README.txt index 27048e369..283ad8318 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -3,11 +3,11 @@ A simple drawing program for children - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ @TuxPaintTweets on Twitter - November 25, 2021 + January 20, 2022 ---------------------------------------------------------------------- @@ -239,6 +239,25 @@ Available Tools As you draw, a sound is played. The bigger the brush, the lower the pitch. + Brush Spacing + + The space between each position where a brush is applied + to the canvas can vary. Some brushes (such as the + footprints and flower) are spaced, by default, far enough + apart that they don't overlap. Other brushes (such as the + basic circular ones) are spaced closely, so they make a + continuous stroke. + + The default spacing of brushes may be overridden using by + clicking within the triangular-shaped series of bars at + the bottom right; the larger the bar, the wider the + spacing. Brush spacing affects both tools that use the + brushes: the "Paint" tool and the "Lines" tool. + + (Note: If the "nobrushspacing" option is set, Tux Paint + won't display the brush spacing controls. See the + "Options" documentation.) + ---------------------------------------------------------------------- "Stamp" Tool (Rubber Stamps) @@ -305,6 +324,11 @@ Available Tools finally some are both animated and directional. See "Paint", above, to learn more. + Different brushes have different spacing, leaving either a + series of individual shapes, or a continuous stroke of the + brush shape. Brush spacing may be adjusted. See "Paint", + above, to learn more. + ---------------------------------------------------------------------- "Shapes" Tool @@ -1024,7 +1048,7 @@ Importing Pictures Manually * Contact the developers directly To learn more, visit the "Contact" page of the official Tux Paint - website: http://tuxpaint.org/contact/ + website: https://tuxpaint.org/contact/ ---------------------------------------------------------------------- @@ -1041,4 +1065,4 @@ Importing Pictures Manually * Promote or help support others using Tux Paint To learn more, visit the "Help Us" page of the official Tux Paint - website: http://tuxpaint.org/help/ + website: https://tuxpaint.org/help/ diff --git a/docs/en/SIGNALS.txt b/docs/en/SIGNALS.txt index aeaf00926..27aba3e40 100644 --- a/docs/en/SIGNALS.txt +++ b/docs/en/SIGNALS.txt @@ -2,10 +2,10 @@ version 0.9.28 Signals Documentation - Copyright © 2019-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - March 9, 2021 + January 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/en/SVG.txt b/docs/en/SVG.txt index 5ea785423..0e13af5a8 100644 --- a/docs/en/SVG.txt +++ b/docs/en/SVG.txt @@ -2,10 +2,10 @@ version 0.9.28 SVG Documentation - Copyright © 2007-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - March 9, 2021 + January 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/en/html/ADVANCED-STAMPS-HOWTO.html b/docs/en/html/ADVANCED-STAMPS-HOWTO.html index 3ef9d8d1d..7419ab71e 100644 --- a/docs/en/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/en/html/ADVANCED-STAMPS-HOWTO.html @@ -20,12 +20,12 @@ version 0.9.28 Advanced Stamps 'How-To'

- Copyright © 2006-2021 by Albert Cahalan and others; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan and others; see AUTHORS.
+ https://tuxpaint.org/

- August 29, 2021

+ January 20, 2022

- Copyright © 2021-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- August 8, 2021

+ January 20, 2022

diff --git a/docs/en/html/EXTENDING.html b/docs/en/html/EXTENDING.html index e2b714220..a38b35b9a 100644 --- a/docs/en/html/EXTENDING.html +++ b/docs/en/html/EXTENDING.html @@ -21,12 +21,12 @@ version 0.9.28

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- September 19, 2021

+ January 20, 2022

- Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: http://www.tuxpaint.org/download/source/git/), and on the Tux Paint website at http://www.tuxpaint.org/help/po/.

+ Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: https://tuxpaint.org/download/source/git/), and on the Tux Paint website at https://tuxpaint.org/help/po/.

To edit an existing translation, download the latest ".po" file for that language, and edit it as described above.

- You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/).

+ You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/).

Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access to the Git source code repository so that you may commit your changes directly.

diff --git a/docs/en/html/FAQ.html b/docs/en/html/FAQ.html index eaef6a4b7..88da139d6 100644 --- a/docs/en/html/FAQ.html +++ b/docs/en/html/FAQ.html @@ -20,12 +20,12 @@ version 0.9.28 Frequently Asked Questions

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- August 29, 2021

+ January 20, 2022

http://www.tuxpaint.org/download/fonts/ + "https://tuxpaint.org/download/fonts/">https://tuxpaint.org/download/fonts/

@@ -822,7 +822,7 @@

- http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/

diff --git a/docs/en/html/INSTALL.html b/docs/en/html/INSTALL.html index debd9a4ac..6f95bdfc8 100644 --- a/docs/en/html/INSTALL.html +++ b/docs/en/html/INSTALL.html @@ -21,12 +21,12 @@ Installation Documentation

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- September 17, 2021

+ January 20, 2022

@@ -797,11 +797,11 @@

libimagequant is not available from MacPorts as of this writing. It can be installed from the source code as follows. It should be installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg.

+ $ sudo port install rust cargo
$ git clone https://github.com/ImageOptim/libimagequant.git
- $ cd libimagequant
- $ ./configure --prefix=/opt/local
- $ make
- $ sudo make install + $ cd libimagequant/imagequant-sys
+ $ cargo build --release
+ $ sudo make PREFIX=/opt/local install

diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index 3ca789af0..a6e96663e 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -20,12 +20,12 @@ Options Documentation

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- August 29, 2021

+ January 20, 2022

Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label".

+ +
+ nobrushspacing=yes +
+ +
+

+ Disables the brush spacing option of the Paint and Lines tools. The brushes' default spacings will be used.

+

+ Note: The brush spacing option was added to Tux Paint's user interface in version 0.9.28. For more information on brush spacing, see EXTENDING.html

+

+ Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing".

+
@@ -5431,7 +5444,7 @@

- You can download fonts for supported languages from Tux Paint's website, http://www.tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

+ You can download fonts for supported languages from Tux Paint's website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

Under Unix and Linux, you can use the Makefile that comes with the font to install the font in the appropriate location.

diff --git a/docs/en/html/PNG.html b/docs/en/html/PNG.html index d5303ebc2..07283bee5 100644 --- a/docs/en/html/PNG.html +++ b/docs/en/html/PNG.html @@ -21,12 +21,12 @@ PNG Documentation

- Copyright © 2007-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- March 9, 2021

+ January 20, 2022

diff --git a/docs/en/html/README.html b/docs/en/html/README.html index 9f365a060..8c410cc99 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -23,13 +23,13 @@ A simple drawing program for children

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/
+ Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/
@TuxPaintTweets on Twitter

- November 25, 2021

+ January 20, 2022

+ Brush Spacing +
+

+ The space between each position where a brush is applied to the canvas can vary. Some brushes (such as the footprints and flower) are spaced, by default, far enough apart that they don't overlap. Other brushes (such as the basic circular ones) are spaced closely, so they make a continuous stroke.

+

+ The default spacing of brushes may be overridden using by clicking within the triangular-shaped series of bars at the bottom right; the larger the bar, the wider the spacing. Brush spacing affects both tools that use the brushes: the "Paint" tool and the "Lines" tool.

+

+ +

+

+ (Note: If the "nobrushspacing" option is set, Tux Paint won't display the brush spacing controls. See the "Options" documentation.)

+
+
@@ -516,6 +533,9 @@

Some brushes are animated, and will show a pattern of shapes along the line. Others are directional, and will show a different shape depending on the angle of the brush. And finally some are both animated and directional. See "Paint", above, to learn more.

+ +

+ Different brushes have different spacing, leaving either a series of individual shapes, or a continuous stroke of the brush shape. Brush spacing may be adjusted. See "Paint", above, to learn more.


@@ -1151,6 +1171,14 @@

Note: The slowest setting does not automatically advance through the slides. Use it for when you want to step through them manually. (This does not apply to an exported animated GIF.)

+ +

+ +

@@ -1467,7 +1495,7 @@

- To learn more, visit the "Contact" page of the official Tux Paint website: http://tuxpaint.org/contact/

+ To learn more, visit the "Contact" page of the official Tux Paint website: https://tuxpaint.org/contact/

- To learn more, visit the "Help Us" page of the official Tux Paint website: http://tuxpaint.org/help/

+ To learn more, visit the "Help Us" page of the official Tux Paint website: https://tuxpaint.org/help/

diff --git a/docs/en/html/SIGNALS.html b/docs/en/html/SIGNALS.html index eddca7fc9..c72f0f741 100644 --- a/docs/en/html/SIGNALS.html +++ b/docs/en/html/SIGNALS.html @@ -21,12 +21,12 @@ Signals Documentation

- Copyright © 2019-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- March 9, 2021

+ January 20, 2022

diff --git a/docs/en/html/SVG.html b/docs/en/html/SVG.html index bc92b5ae5..fc6d72ada 100644 --- a/docs/en/html/SVG.html +++ b/docs/en/html/SVG.html @@ -21,12 +21,12 @@ SVG Documentation

- Copyright © 2007-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- March 9, 2021

+ January 20, 2022

diff --git a/docs/es_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt b/docs/es_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt index 45e4b2b49..f42eff48d 100644 --- a/docs/es_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/es_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt @@ -1,10 +1,10 @@ Tux Paint versión 0.9.28 Advanced Stamps 'How-To' - Copyright © 2006-2021 by Albert Cahalan and others; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan and others; see AUTHORS. + https://tuxpaint.org/ - agosto 29, 2021 + enero 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/es_ES.UTF-8/ENVVARS.txt b/docs/es_ES.UTF-8/ENVVARS.txt index 6d7e38d44..6557bdcbe 100644 --- a/docs/es_ES.UTF-8/ENVVARS.txt +++ b/docs/es_ES.UTF-8/ENVVARS.txt @@ -2,10 +2,10 @@ versión 0.9.28 Environment Variables Documentation - Copyright © 2021-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - agosto 8, 2021 + enero 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/es_ES.UTF-8/EXTENDING.txt b/docs/es_ES.UTF-8/EXTENDING.txt index 90f495713..e1920aaf8 100644 --- a/docs/es_ES.UTF-8/EXTENDING.txt +++ b/docs/es_ES.UTF-8/EXTENDING.txt @@ -2,10 +2,10 @@ Tux Paint versión 0.9.28 - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - septiembre 19, 2021 + enero 20, 2022 ---------------------------------------------------------------------- @@ -679,15 +679,15 @@ Translations template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: - http://www.tuxpaint.org/download/source/git/), and on the Tux Paint - website at http://www.tuxpaint.org/help/po/. + https://tuxpaint.org/download/source/git/), and on the Tux Paint website + at https://tuxpaint.org/help/po/. To edit an existing translation, download the latest ".po" file for that language, and edit it as described above. You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to - the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/). + the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/). Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access diff --git a/docs/es_ES.UTF-8/FAQ.txt b/docs/es_ES.UTF-8/FAQ.txt index 1d801f195..5e386821e 100644 --- a/docs/es_ES.UTF-8/FAQ.txt +++ b/docs/es_ES.UTF-8/FAQ.txt @@ -1,10 +1,10 @@ Tux Paint versión 0.9.28 Frequently Asked Questions - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - agosto 29, 2021 + enero 20, 2022 ---------------------------------------------------------------------- @@ -170,7 +170,7 @@ Interface Problems The appropriate fonts for such locales can be downloaded from the Tux Paint website: - http://www.tuxpaint.org/download/fonts/ + https://tuxpaint.org/download/fonts/ ---------------------------------------------------------------------- @@ -637,7 +637,7 @@ Help / Contact Any questions you don't see answered? Please let us know! You can subscribe and post to our "tuxpaint-users" mailing list: - http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/ Or, contact lead developer Bill Kendrick directly: diff --git a/docs/es_ES.UTF-8/INSTALL.txt b/docs/es_ES.UTF-8/INSTALL.txt index 8138b9627..69c0656a0 100644 --- a/docs/es_ES.UTF-8/INSTALL.txt +++ b/docs/es_ES.UTF-8/INSTALL.txt @@ -2,10 +2,10 @@ versión 0.9.28 Installation Documentation - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - septiembre 17, 2021 + enero 20, 2022 ---------------------------------------------------------------------- @@ -637,11 +637,11 @@ Compiling and Installation installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg. + $ sudo port install rust cargo $ git clone https://github.com/ImageOptim/libimagequant.git - $ cd libimagequant - $ ./configure --prefix=/opt/local - $ make - $ sudo make install + $ cd libimagequant/imagequant-sys + $ cargo build --release + $ sudo make PREFIX=/opt/local install WARNING: Having any UNIX-like toolset installed on your Mac besides MacPorts and Xcode, such as Fink or Brew, will prevent your app diff --git a/docs/es_ES.UTF-8/OPTIONS.txt b/docs/es_ES.UTF-8/OPTIONS.txt index f01a22296..fcdec8e6c 100644 --- a/docs/es_ES.UTF-8/OPTIONS.txt +++ b/docs/es_ES.UTF-8/OPTIONS.txt @@ -3,10 +3,10 @@ Options Documentation - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - agosto 29, 2021 + enero 20, 2022 ---------------------------------------------------------------------- @@ -454,6 +454,21 @@ Simplification "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label". + nobrushspacing=yes + + Disables the brush spacing option of the Paint and Lines + tools. The brushes' default spacings will be used. + + Note: The brush spacing option was added to Tux Paint's user + interface in version 0.9.28. For more information on brush + spacing, see EXTENDING.html + + Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "nobrushspacing=no" or "brushspacing=yes". In both cases, + may be overridden by the command-line option + "--brushspacing". + ---------------------------------------------------------------------- Languages @@ -1960,7 +1975,7 @@ Special Fonts /usr/share/tuxpaint/fonts/locale/ko.ttf You can download fonts for supported languages from Tux Paint's - website, http://www.tuxpaint.org/. (Look in the 'Fonts' section under + website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.') Under Unix and Linux, you can use the Makefile that comes with the diff --git a/docs/es_ES.UTF-8/PNG.txt b/docs/es_ES.UTF-8/PNG.txt index 802d3d8de..b7a5c18e4 100644 --- a/docs/es_ES.UTF-8/PNG.txt +++ b/docs/es_ES.UTF-8/PNG.txt @@ -2,10 +2,10 @@ versión 0.9.28 PNG Documentation - Copyright © 2007-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - marzo 9, 2021 + enero 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt index 451fe1fad..506fd5bf6 100644 --- a/docs/es_ES.UTF-8/README.txt +++ b/docs/es_ES.UTF-8/README.txt @@ -3,11 +3,11 @@ A simple drawing program for children - Copyright © 2002-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ @TuxPaintTweets on Twitter - noviembre 25, 2021 + enero 20, 2022 ---------------------------------------------------------------------- @@ -239,6 +239,25 @@ Available Tools As you draw, a sound is played. The bigger the brush, the lower the pitch. + Brush Spacing + + The space between each position where a brush is applied + to the canvas can vary. Some brushes (such as the + footprints and flower) are spaced, by default, far enough + apart that they don't overlap. Other brushes (such as the + basic circular ones) are spaced closely, so they make a + continuous stroke. + + The default spacing of brushes may be overridden using by + clicking within the triangular-shaped series of bars at + the bottom right; the larger the bar, the wider the + spacing. Brush spacing affects both tools that use the + brushes: the "Paint" tool and the "Lines" tool. + + (Note: If the "nobrushspacing" option is set, Tux Paint + won't display the brush spacing controls. See the + "Options" documentation.) + ---------------------------------------------------------------------- "Stamp" Tool (Rubber Stamps) @@ -305,6 +324,11 @@ Available Tools finally some are both animated and directional. See "Paint", above, to learn more. + Different brushes have different spacing, leaving either a + series of individual shapes, or a continuous stroke of the + brush shape. Brush spacing may be adjusted. See "Paint", + above, to learn more. + ---------------------------------------------------------------------- "Shapes" Tool @@ -1024,7 +1048,7 @@ Importing Pictures Manually * Contact the developers directly To learn more, visit the "Contact" page of the official Tux Paint - website: http://tuxpaint.org/contact/ + website: https://tuxpaint.org/contact/ ---------------------------------------------------------------------- @@ -1041,4 +1065,4 @@ Importing Pictures Manually * Promote or help support others using Tux Paint To learn more, visit the "Help Us" page of the official Tux Paint - website: http://tuxpaint.org/help/ + website: https://tuxpaint.org/help/ diff --git a/docs/es_ES.UTF-8/SIGNALS.txt b/docs/es_ES.UTF-8/SIGNALS.txt index 10ce1bfeb..bdad85a71 100644 --- a/docs/es_ES.UTF-8/SIGNALS.txt +++ b/docs/es_ES.UTF-8/SIGNALS.txt @@ -2,10 +2,10 @@ versión 0.9.28 Signals Documentation - Copyright © 2019-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - marzo 9, 2021 + enero 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/es_ES.UTF-8/SVG.txt b/docs/es_ES.UTF-8/SVG.txt index 60682d89f..1a0cbc9dd 100644 --- a/docs/es_ES.UTF-8/SVG.txt +++ b/docs/es_ES.UTF-8/SVG.txt @@ -2,10 +2,10 @@ versión 0.9.28 SVG Documentation - Copyright © 2007-2021 by various contributors; see AUTHORS. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS. + https://tuxpaint.org/ - marzo 9, 2021 + enero 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/es_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html b/docs/es_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html index 70101a49d..30fe237f4 100644 --- a/docs/es_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/es_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html @@ -20,12 +20,12 @@ versión 0.9.28 Advanced Stamps 'How-To'

- Copyright © 2006-2021 by Albert Cahalan and others; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan and others; see AUTHORS.
+ https://tuxpaint.org/

- agosto 29, 2021

+ enero 20, 2022

- Copyright © 2021-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- agosto 8, 2021

+ enero 20, 2022

diff --git a/docs/es_ES.UTF-8/html/EXTENDING.html b/docs/es_ES.UTF-8/html/EXTENDING.html index 2a8c7ced8..0197b1288 100644 --- a/docs/es_ES.UTF-8/html/EXTENDING.html +++ b/docs/es_ES.UTF-8/html/EXTENDING.html @@ -21,12 +21,12 @@ versión 0.9.28

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- septiembre 19, 2021

+ enero 20, 2022

- Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: http://www.tuxpaint.org/download/source/git/), and on the Tux Paint website at http://www.tuxpaint.org/help/po/.

+ Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: https://tuxpaint.org/download/source/git/), and on the Tux Paint website at https://tuxpaint.org/help/po/.

To edit an existing translation, download the latest ".po" file for that language, and edit it as described above.

- You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/).

+ You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/).

Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access to the Git source code repository so that you may commit your changes directly.

diff --git a/docs/es_ES.UTF-8/html/FAQ.html b/docs/es_ES.UTF-8/html/FAQ.html index 5609d5d17..67f9af4ca 100644 --- a/docs/es_ES.UTF-8/html/FAQ.html +++ b/docs/es_ES.UTF-8/html/FAQ.html @@ -20,12 +20,12 @@ versión 0.9.28 Frequently Asked Questions

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- agosto 29, 2021

+ enero 20, 2022

http://www.tuxpaint.org/download/fonts/ + "https://tuxpaint.org/download/fonts/">https://tuxpaint.org/download/fonts/

@@ -822,7 +822,7 @@

- http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/

diff --git a/docs/es_ES.UTF-8/html/INSTALL.html b/docs/es_ES.UTF-8/html/INSTALL.html index 2ee2c1b8c..aaff0905f 100644 --- a/docs/es_ES.UTF-8/html/INSTALL.html +++ b/docs/es_ES.UTF-8/html/INSTALL.html @@ -21,12 +21,12 @@ Installation Documentation

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- septiembre 17, 2021

+ enero 20, 2022

@@ -797,11 +797,11 @@

libimagequant is not available from MacPorts as of this writing. It can be installed from the source code as follows. It should be installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg.

+ $ sudo port install rust cargo
$ git clone https://github.com/ImageOptim/libimagequant.git
- $ cd libimagequant
- $ ./configure --prefix=/opt/local
- $ make
- $ sudo make install + $ cd libimagequant/imagequant-sys
+ $ cargo build --release
+ $ sudo make PREFIX=/opt/local install

diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html index ba70ad65c..b3b08f2bc 100644 --- a/docs/es_ES.UTF-8/html/OPTIONS.html +++ b/docs/es_ES.UTF-8/html/OPTIONS.html @@ -20,12 +20,12 @@ Options Documentation

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- agosto 29, 2021

+ enero 20, 2022

Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label".

+ +
+ nobrushspacing=yes +
+ +
+

+ Disables the brush spacing option of the Paint and Lines tools. The brushes' default spacings will be used.

+

+ Note: The brush spacing option was added to Tux Paint's user interface in version 0.9.28. For more information on brush spacing, see EXTENDING.html

+

+ Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing".

+
@@ -5408,7 +5421,7 @@

- You can download fonts for supported languages from Tux Paint's website, http://www.tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

+ You can download fonts for supported languages from Tux Paint's website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

Under Unix and Linux, you can use the Makefile that comes with the font to install the font in the appropriate location.

diff --git a/docs/es_ES.UTF-8/html/PNG.html b/docs/es_ES.UTF-8/html/PNG.html index 44fca3ccf..9f499e8b3 100644 --- a/docs/es_ES.UTF-8/html/PNG.html +++ b/docs/es_ES.UTF-8/html/PNG.html @@ -21,12 +21,12 @@ PNG Documentation

- Copyright © 2007-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- marzo 9, 2021

+ enero 20, 2022

diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html index 8194c205a..4584f5525 100644 --- a/docs/es_ES.UTF-8/html/README.html +++ b/docs/es_ES.UTF-8/html/README.html @@ -23,13 +23,13 @@ A simple drawing program for children

- Copyright © 2002-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/
+ Copyright © 2002-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/
@TuxPaintTweets on Twitter

- noviembre 25, 2021

+ enero 20, 2022

+ Brush Spacing +
+

+ The space between each position where a brush is applied to the canvas can vary. Some brushes (such as the footprints and flower) are spaced, by default, far enough apart that they don't overlap. Other brushes (such as the basic circular ones) are spaced closely, so they make a continuous stroke.

+

+ The default spacing of brushes may be overridden using by clicking within the triangular-shaped series of bars at the bottom right; the larger the bar, the wider the spacing. Brush spacing affects both tools that use the brushes: the "Paint" tool and the "Lines" tool.

+

+ +

+

+ (Note: If the "nobrushspacing" option is set, Tux Paint won't display the brush spacing controls. See the "Options" documentation.)

+
+
@@ -516,6 +533,9 @@

Some brushes are animated, and will show a pattern of shapes along the line. Others are directional, and will show a different shape depending on the angle of the brush. And finally some are both animated and directional. See "Paint", above, to learn more.

+ +

+ Different brushes have different spacing, leaving either a series of individual shapes, or a continuous stroke of the brush shape. Brush spacing may be adjusted. See "Paint", above, to learn more.


@@ -1151,6 +1171,14 @@

Note: The slowest setting does not automatically advance through the slides. Use it for when you want to step through them manually. (This does not apply to an exported animated GIF.)

+ +

+ +

@@ -1467,7 +1495,7 @@

- To learn more, visit the "Contact" page of the official Tux Paint website: http://tuxpaint.org/contact/

+ To learn more, visit the "Contact" page of the official Tux Paint website: https://tuxpaint.org/contact/

- To learn more, visit the "Help Us" page of the official Tux Paint website: http://tuxpaint.org/help/

+ To learn more, visit the "Help Us" page of the official Tux Paint website: https://tuxpaint.org/help/

diff --git a/docs/es_ES.UTF-8/html/SIGNALS.html b/docs/es_ES.UTF-8/html/SIGNALS.html index c92354561..7e052ed27 100644 --- a/docs/es_ES.UTF-8/html/SIGNALS.html +++ b/docs/es_ES.UTF-8/html/SIGNALS.html @@ -21,12 +21,12 @@ Signals Documentation

- Copyright © 2019-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- marzo 9, 2021

+ enero 20, 2022

diff --git a/docs/es_ES.UTF-8/html/SVG.html b/docs/es_ES.UTF-8/html/SVG.html index 8fbb50160..4081eaa0f 100644 --- a/docs/es_ES.UTF-8/html/SVG.html +++ b/docs/es_ES.UTF-8/html/SVG.html @@ -21,12 +21,12 @@ SVG Documentation

- Copyright © 2007-2021 by various contributors; see AUTHORS.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; see AUTHORS.
+ https://tuxpaint.org/

- marzo 9, 2021

+ enero 20, 2022

diff --git a/docs/fr_FR.UTF-8/ADVANCED-STAMPS-HOWTO.txt b/docs/fr_FR.UTF-8/ADVANCED-STAMPS-HOWTO.txt index cb11635c7..790837162 100644 --- a/docs/fr_FR.UTF-8/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/fr_FR.UTF-8/ADVANCED-STAMPS-HOWTO.txt @@ -1,10 +1,10 @@ Tux Paint version 0.9.28 'Guide pratique" pour les tampons de haute qualité - Copyright &copie; 2006-2021 par Albert Cahalan et d'autres; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2006-2022 par Albert Cahalan et d'autres; voir AUTHORS. + https://tuxpaint.org/ - août 29, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/fr_FR.UTF-8/ENVVARS.txt b/docs/fr_FR.UTF-8/ENVVARS.txt index 5dbd1d43b..bd2192dd6 100644 --- a/docs/fr_FR.UTF-8/ENVVARS.txt +++ b/docs/fr_FR.UTF-8/ENVVARS.txt @@ -2,10 +2,10 @@ version 0.9.28 Documentation sur les variables d'environnement - Copyright &copie; 2021-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2021-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - août 8, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/fr_FR.UTF-8/EXTENDING.txt b/docs/fr_FR.UTF-8/EXTENDING.txt index a52c237f6..a97ae3d7d 100644 --- a/docs/fr_FR.UTF-8/EXTENDING.txt +++ b/docs/fr_FR.UTF-8/EXTENDING.txt @@ -2,10 +2,10 @@ Tux Paint version 0.9.28 - Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - septembre 19, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- @@ -740,8 +740,8 @@ Traductions texte est ajouté et l'ancien texte est parfois modifié. Le catalogue de textes de la prochaine version inédite de Tux Paint se trouve dans le référentiel Git de Tux Paint (voir : - http://www.tuxpaint.org/download/source/git/ ), et sur le site Web de - Tux Paint à http://www.tuxpaint.org/help/po/. + https://tuxpaint.org/download/source/git/ ), et sur le site Web de Tux + Paint à https://tuxpaint.org/help/po/. Pour modifier une traduction existante, téléchargez le dernier fichier ".po" pour cette langue et modifiez-le comme décrit ci-dessus. @@ -749,7 +749,7 @@ Traductions Vous pouvez envoyer des fichiers de traduction nouveaux ou modifiés à Bill Kendrick , responsable du développement principal de Tux Paint , à : bill@newbreedsoftware.com, ou les poster sur la liste de diffusion - "tuxpaint-i18n" (voir : http://www.tuxpaint.org/lists/ ). + "tuxpaint-i18n" (voir : https://tuxpaint.org/lists/ ). Autrement, si vous avez un compte chez SourceForge.net , vous pouvez demander à être ajouté au projet "tuxpaint" et obtenir un accès en diff --git a/docs/fr_FR.UTF-8/FAQ.txt b/docs/fr_FR.UTF-8/FAQ.txt index 235d85d30..cc30b645a 100644 --- a/docs/fr_FR.UTF-8/FAQ.txt +++ b/docs/fr_FR.UTF-8/FAQ.txt @@ -1,10 +1,10 @@ Tux Paint version 0.9.28 Questions fréquemment posées - Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - août 29, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- @@ -187,7 +187,7 @@ Problèmes d'interface Les fontes adéquates pour de telles langues peuvent être téléchargées depuis le site de Tux Paint : - http://www.tuxpaint.org/download/fonts/ + https://tuxpaint.org/download/fonts/ ---------------------------------------------------------------------- @@ -688,7 +688,7 @@ Aide / Contact faire savoir ! Vous pouvez vous abonner et écrire sur notre liste de diffusion "tuxpaint-users" : - http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/ Ou contactez directement le développeur principal Bill Kendrick : diff --git a/docs/fr_FR.UTF-8/INSTALL.txt b/docs/fr_FR.UTF-8/INSTALL.txt index f08ee4acc..a2a294f6c 100644 --- a/docs/fr_FR.UTF-8/INSTALL.txt +++ b/docs/fr_FR.UTF-8/INSTALL.txt @@ -2,10 +2,10 @@ version 0.9.28 Documentation sur l'installation - Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - septembre 17, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- @@ -666,11 +666,11 @@ Compilation et installation peut être installé sur /opt/local (comme pour MacPorts) pour la bibliothèque devant être incluse dans TuxPaint.dmg. + $ sudo port install rust cargo $ git clone https://github.com/ImageOptim/libimagequant.git - $ cd libimagequant - $ ./configure --prefix=/opt/local - $ make - $ sudo make install + $ cd libimagequant/imagequant-sys + $ cargo build --release + $ sudo make PREFIX=/opt/local install ATTENTION :Posséder des outils Unix à côté de MacPorts et Xcode, tels que Fink ou Brew, vous empêchera de créer un programme diff --git a/docs/fr_FR.UTF-8/OPTIONS.txt b/docs/fr_FR.UTF-8/OPTIONS.txt index a1222370f..86afde984 100644 --- a/docs/fr_FR.UTF-8/OPTIONS.txt +++ b/docs/fr_FR.UTF-8/OPTIONS.txt @@ -3,10 +3,10 @@ Documentation sur les options - Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - août 29, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- @@ -500,6 +500,22 @@ Simplification "label=yes". Dans les deux cas, il peut être remplacé avec l'option en ligne de commande "--label". + nobrushspacing=yes + + Disables the brush spacing option of the Paint and Lines + tools. The brushes' default spacings will be used. + + Note: The brush spacing option was added to Tux Paint's user + interface in version 0.9.28. For more information on brush + spacing, see EXTENDING.html + + Note : si utilisé dans un fichier de configuration pour tout + le monde, il peut être remplacé par le fichier de + configuration de l(utilisateur en utilisant + "nobrushspacing=no" ou "brushspacing=yes". Dans les deux + cas, il peut être remplacé avec l'option en ligne de + commande "--brushspacing". + ---------------------------------------------------------------------- Langues @@ -2093,9 +2109,9 @@ Polices spéciales /usr/share/tuxpaint/fonts/locale/ko.ttf - Vous pouvez télécharger des polices pour les langues prises en charge - sur le site Web de Tux Paint, http://www.tuxpaint.org/ . (Regardez - dans la section "Polices" sous "Télécharger".) + You can download fonts for supported languages from Tux Paint's + website, https://tuxpaint.org/. (Look in the 'Fonts' section under + 'Download.') Sous Unix et Linux, vous pouvez utiliser le Makefile qui est fourni avec la police pour installer la police à l'emplacement approprié. diff --git a/docs/fr_FR.UTF-8/PNG.txt b/docs/fr_FR.UTF-8/PNG.txt index aafc267ff..d1bd69a5e 100644 --- a/docs/fr_FR.UTF-8/PNG.txt +++ b/docs/fr_FR.UTF-8/PNG.txt @@ -2,10 +2,10 @@ version 0.9.28 Documentation sur PNG pour Tux Paint - Copyright &copie; 2007-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2007-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - mars 9, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt index 79017028c..6bb8e8da6 100644 --- a/docs/fr_FR.UTF-8/README.txt +++ b/docs/fr_FR.UTF-8/README.txt @@ -3,11 +3,11 @@ Un programme simple pour les enfants - Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ @TuxPaintTweets on Twitter - novembre 25, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- @@ -256,6 +256,25 @@ Outils disponibles Pendant que vous dessinez, un son est joué. Plus la brosse est grosse, plus le son est grave. + Espacement des pinceaux + + The space between each position where a brush is applied + to the canvas can vary. Some brushes (such as the + footprints and flower) are spaced, by default, far enough + apart that they don't overlap. Other brushes (such as the + basic circular ones) are spaced closely, so they make a + continuous stroke. + + The default spacing of brushes may be overridden using by + clicking within the triangular-shaped series of bars at + the bottom right; the larger the bar, the wider the + spacing. Brush spacing affects both tools that use the + brushes: the "Paint" tool and the "Lines" tool. + + (Note: If the "nobrushspacing" option is set, Tux Paint + won't display the brush spacing controls. See the + "Options" documentation.) + ---------------------------------------------------------------------- Outil "Tampon" (tampon de caoutchouc) @@ -328,6 +347,11 @@ Outils disponibles certains sont à la fois animés et directionnels. Voir "Paint", au-dessus, pour en savoir plus. + Different brushes have different spacing, leaving either a + series of individual shapes, or a continuous stroke of the + brush shape. Brush spacing may be adjusted. See "Paint", + above, to learn more. + ---------------------------------------------------------------------- Outil "Formes" @@ -1109,7 +1133,7 @@ Importer des images manuellement * Contacter les développeurs directement Pour en savoir plus, visitez la page "Contact" du site officiel de Tux - Paint : http://tuxpaint.org/contact/ + Paint : https://tuxpaint.org/contact/ ---------------------------------------------------------------------- @@ -1126,4 +1150,4 @@ Importer des images manuellement * Promouvoir ou aider ceux qui utilisent Tux Paint Pour en savoir plus, visitez la page "Nous aider" du site officiel de - Tux Paint : http://tuxpaint.org/help/ + Tux Paint : https://tuxpaint.org/help/ diff --git a/docs/fr_FR.UTF-8/SIGNALS.txt b/docs/fr_FR.UTF-8/SIGNALS.txt index 16a9bedad..097443086 100644 --- a/docs/fr_FR.UTF-8/SIGNALS.txt +++ b/docs/fr_FR.UTF-8/SIGNALS.txt @@ -2,10 +2,10 @@ version 0.9.28 Documentation sur les signaux - Copyright &copie; 2019-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2019-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - mars 9, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/fr_FR.UTF-8/SVG.txt b/docs/fr_FR.UTF-8/SVG.txt index 0bf2559a7..3954574ed 100644 --- a/docs/fr_FR.UTF-8/SVG.txt +++ b/docs/fr_FR.UTF-8/SVG.txt @@ -2,10 +2,10 @@ version 0.9.28 Documentation sur SVG - Copyright &copie; 2007-2021 par divers contributeurs; voir AUTHORS. - http://www.tuxpaint.org/ + Copyright &copie; 2007-2022 par divers contributeurs; voir AUTHORS. + https://tuxpaint.org/ - mars 9, 2021 + janvier 20, 2022 ---------------------------------------------------------------------- diff --git a/docs/fr_FR.UTF-8/html/ADVANCED-STAMPS-HOWTO.html b/docs/fr_FR.UTF-8/html/ADVANCED-STAMPS-HOWTO.html index d7d98e604..a5a9eeefd 100644 --- a/docs/fr_FR.UTF-8/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/fr_FR.UTF-8/html/ADVANCED-STAMPS-HOWTO.html @@ -20,12 +20,12 @@ version 0.9.28 'Guide pratique" pour les tampons de haute qualité

- Copyright &copie; 2006-2021 par Albert Cahalan et d'autres; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2006-2022 par Albert Cahalan et d'autres; voir AUTHORS.
+ https://tuxpaint.org/

- août 29, 2021

+ janvier 20, 2022

- Copyright &copie; 2021-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2021-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- août 8, 2021

+ janvier 20, 2022

diff --git a/docs/fr_FR.UTF-8/html/EXTENDING.html b/docs/fr_FR.UTF-8/html/EXTENDING.html index a9731a141..ebbcf69c2 100644 --- a/docs/fr_FR.UTF-8/html/EXTENDING.html +++ b/docs/fr_FR.UTF-8/html/EXTENDING.html @@ -21,12 +21,12 @@ version 0.9.28

- Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- septembre 19, 2021

+ janvier 20, 2022

- Remarque: Il est préférable de toujours travailler avec le dernier modèle de catalogue de texte Tux Paint ("tuxpaint.pot"), car un nouveau texte est ajouté et l'ancien texte est parfois modifié. Le catalogue de textes de la prochaine version inédite de Tux Paint se trouve dans le référentiel Git de Tux Paint (voir : http://www.tuxpaint.org/download/source/git/ ), et sur le site Web de Tux Paint à http://www.tuxpaint.org/help/po/.

+ Remarque: Il est préférable de toujours travailler avec le dernier modèle de catalogue de texte Tux Paint ("tuxpaint.pot"), car un nouveau texte est ajouté et l'ancien texte est parfois modifié. Le catalogue de textes de la prochaine version inédite de Tux Paint se trouve dans le référentiel Git de Tux Paint (voir : https://tuxpaint.org/download/source/git/ ), et sur le site Web de Tux Paint à https://tuxpaint.org/help/po/.

Pour modifier une traduction existante, téléchargez le dernier fichier ".po" pour cette langue et modifiez-le comme décrit ci-dessus.

- Vous pouvez envoyer des fichiers de traduction nouveaux ou modifiés à Bill Kendrick , responsable du développement principal de Tux Paint , à : bill@newbreedsoftware.com, ou les poster sur la liste de diffusion "tuxpaint-i18n" (voir : http://www.tuxpaint.org/lists/ ).

+ Vous pouvez envoyer des fichiers de traduction nouveaux ou modifiés à Bill Kendrick , responsable du développement principal de Tux Paint , à : bill@newbreedsoftware.com, ou les poster sur la liste de diffusion "tuxpaint-i18n" (voir : https://tuxpaint.org/lists/ ).

Autrement, si vous avez un compte chez SourceForge.net , vous pouvez demander à être ajouté au projet "tuxpaint" et obtenir un accès en écriture au référentiel de code source Git afin que vous puissiez valider vos modifications directement.

diff --git a/docs/fr_FR.UTF-8/html/FAQ.html b/docs/fr_FR.UTF-8/html/FAQ.html index 7f858cf79..e5c7111f7 100644 --- a/docs/fr_FR.UTF-8/html/FAQ.html +++ b/docs/fr_FR.UTF-8/html/FAQ.html @@ -20,12 +20,12 @@ version 0.9.28 Questions fréquemment posées

- Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- août 29, 2021

+ janvier 20, 2022

http://www.tuxpaint.org/download/fonts/ + "https://tuxpaint.org/download/fonts/">https://tuxpaint.org/download/fonts/

@@ -823,7 +823,7 @@ cible "nosound". (c'est-à-dire, ne lancez pas "make nosound") Assu

- http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/

diff --git a/docs/fr_FR.UTF-8/html/INSTALL.html b/docs/fr_FR.UTF-8/html/INSTALL.html index d5aa410a1..2c0cc0cb9 100644 --- a/docs/fr_FR.UTF-8/html/INSTALL.html +++ b/docs/fr_FR.UTF-8/html/INSTALL.html @@ -21,12 +21,12 @@ Documentation sur l'installation

- Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- septembre 17, 2021

+ janvier 20, 2022

@@ -797,11 +797,11 @@

libimagequant n'est pas disponible sur MacPorts à cette heure. Il peut être installé sur /opt/local (comme pour MacPorts) pour la bibliothèque devant être incluse dans TuxPaint.dmg.

+ $ sudo port install rust cargo
$ git clone https://github.com/ImageOptim/libimagequant.git
- $ cd libimagequant
- $ ./configure --prefix=/opt/local
- $ make
- $ sudo make install + $ cd libimagequant/imagequant-sys
+ $ cargo build --release
+ $ sudo make PREFIX=/opt/local install

diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html index 04f03ee29..72695f404 100644 --- a/docs/fr_FR.UTF-8/html/OPTIONS.html +++ b/docs/fr_FR.UTF-8/html/OPTIONS.html @@ -20,12 +20,12 @@ Documentation sur les options

- Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- août 29, 2021

+ janvier 20, 2022

Note : si utilisé dans un fichier de configuration pour tout le monde, il peut être remplacé par le fichier de configuration de l(utilisateur en utilisant "nolabel=no" ou "label=yes". Dans les deux cas, il peut être remplacé avec l'option en ligne de commande "--label".

+ +
+ nobrushspacing=yes +
+ +
+

+ Disables the brush spacing option of the Paint and Lines tools. The brushes' default spacings will be used.

+

+ Note: The brush spacing option was added to Tux Paint's user interface in version 0.9.28. For more information on brush spacing, see EXTENDING.html

+

+ Note : si utilisé dans un fichier de configuration pour tout le monde, il peut être remplacé par le fichier de configuration de l(utilisateur en utilisant "nobrushspacing=no" ou "brushspacing=yes". Dans les deux cas, il peut être remplacé avec l'option en ligne de commande "--brushspacing".

+
@@ -5408,7 +5421,7 @@

- Vous pouvez télécharger des polices pour les langues prises en charge sur le site Web de Tux Paint, http://www.tuxpaint.org/ . (Regardez dans la section "Polices" sous "Télécharger".)

+ You can download fonts for supported languages from Tux Paint's website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

Sous Unix et Linux, vous pouvez utiliser le Makefile qui est fourni avec la police pour installer la police à l'emplacement approprié.

diff --git a/docs/fr_FR.UTF-8/html/PNG.html b/docs/fr_FR.UTF-8/html/PNG.html index 391f57d7b..ed512f86d 100644 --- a/docs/fr_FR.UTF-8/html/PNG.html +++ b/docs/fr_FR.UTF-8/html/PNG.html @@ -21,12 +21,12 @@ Documentation sur PNG pour Tux Paint

- Copyright &copie; 2007-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2007-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- mars 9, 2021

+ janvier 20, 2022

diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html index 21e2d5e31..ec85366a1 100644 --- a/docs/fr_FR.UTF-8/html/README.html +++ b/docs/fr_FR.UTF-8/html/README.html @@ -23,13 +23,13 @@ Un programme simple pour les enfants

- Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/
+ Copyright &copie; 2002-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/
@TuxPaintTweets on Twitter

- novembre 25, 2021

+ janvier 20, 2022

+ Espacement des pinceaux +
+

+ The space between each position where a brush is applied to the canvas can vary. Some brushes (such as the footprints and flower) are spaced, by default, far enough apart that they don't overlap. Other brushes (such as the basic circular ones) are spaced closely, so they make a continuous stroke.

+

+ The default spacing of brushes may be overridden using by clicking within the triangular-shaped series of bars at the bottom right; the larger the bar, the wider the spacing. Brush spacing affects both tools that use the brushes: the "Paint" tool and the "Lines" tool.

+

+ +

+

+ (Note: If the "nobrushspacing" option is set, Tux Paint won't display the brush spacing controls. See the "Options" documentation.)

+
+
@@ -516,6 +533,9 @@

Certains pinceaux sont animés, et montre un ensemble formes le long d'une ligne. D'autres sont directionnels et montre des formes différentes suivant l'angle du pinceau. Et enfin certains sont à la fois animés et directionnels. Voir "Paint", au-dessus, pour en savoir plus.

+ +

+ Different brushes have different spacing, leaving either a series of individual shapes, or a continuous stroke of the brush shape. Brush spacing may be adjusted. See "Paint", above, to learn more.


@@ -1151,6 +1171,14 @@

Remarque : le paramètre le plus lent ne fait pas automatiquement avancer les diapositives. Utilisez-le lorsque vous souhaitez les parcourir manuellement. (Cela ne s'applique pas à un GIF animé exporté.)

+ +

+ +

@@ -1467,7 +1495,7 @@

- Pour en savoir plus, visitez la page "Contact" du site officiel de Tux Paint : http://tuxpaint.org/contact/

+ Pour en savoir plus, visitez la page "Contact" du site officiel de Tux Paint : https://tuxpaint.org/contact/

- Pour en savoir plus, visitez la page "Nous aider" du site officiel de Tux Paint : http://tuxpaint.org/help/

+ Pour en savoir plus, visitez la page "Nous aider" du site officiel de Tux Paint : https://tuxpaint.org/help/

diff --git a/docs/fr_FR.UTF-8/html/SIGNALS.html b/docs/fr_FR.UTF-8/html/SIGNALS.html index ddf090abd..069479435 100644 --- a/docs/fr_FR.UTF-8/html/SIGNALS.html +++ b/docs/fr_FR.UTF-8/html/SIGNALS.html @@ -21,12 +21,12 @@ Documentation sur les signaux

- Copyright &copie; 2019-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2019-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- mars 9, 2021

+ janvier 20, 2022

diff --git a/docs/fr_FR.UTF-8/html/SVG.html b/docs/fr_FR.UTF-8/html/SVG.html index 97a87faa9..509c85f02 100644 --- a/docs/fr_FR.UTF-8/html/SVG.html +++ b/docs/fr_FR.UTF-8/html/SVG.html @@ -21,12 +21,12 @@ Documentation sur SVG

- Copyright &copie; 2007-2021 par divers contributeurs; voir AUTHORS.
- http://www.tuxpaint.org/ + Copyright &copie; 2007-2022 par divers contributeurs; voir AUTHORS.
+ https://tuxpaint.org/

- mars 9, 2021

+ janvier 20, 2022

diff --git a/docs/gl_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt b/docs/gl_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt index 1e6033f38..b92567605 100644 --- a/docs/gl_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/gl_ES.UTF-8/ADVANCED-STAMPS-HOWTO.txt @@ -1,10 +1,10 @@ Tux Paint versión 0.9.28 «Como facer» os selos avanzados - Copyright © 2006-2021 por Albert Cahalan e outros; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2006-2022 por Albert Cahalan e outros; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 29 de Agosto de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- diff --git a/docs/gl_ES.UTF-8/ENVVARS.txt b/docs/gl_ES.UTF-8/ENVVARS.txt index e0a019cd2..24d8d5369 100644 --- a/docs/gl_ES.UTF-8/ENVVARS.txt +++ b/docs/gl_ES.UTF-8/ENVVARS.txt @@ -2,10 +2,10 @@ versión 0.9.28 Documentación de variábeis de contorno - Copyright © 2021-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2021-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 8 de Agosto de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- diff --git a/docs/gl_ES.UTF-8/EXTENDING.txt b/docs/gl_ES.UTF-8/EXTENDING.txt index 047066693..6142e8fc7 100644 --- a/docs/gl_ES.UTF-8/EXTENDING.txt +++ b/docs/gl_ES.UTF-8/EXTENDING.txt @@ -2,10 +2,10 @@ Tux Paint versión 0.9.28 - Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 19 de Setembro de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- @@ -699,8 +699,8 @@ Traducións Tux Paint («tuxpaint.pot»), xa que se engade n novos textos e o texto antigo cambia ocasionalmente. O catálogo de texto para a próxima versión inédita de Tux Paint pódese atopar no repositorio Git de Tux Paint (ver: - http://www.tuxpaint.org/download/source/git/) e no sitio web de Tux - Paint en http://www.tuxpaint.org/help/po/. + https://tuxpaint.org/download/source/git/) e no sitio web de Tux Paint + en https://tuxpaint.org/help/po/. Para editar unha tradución existente, descargue o último ficheiro «.po» para ese idioma e edíteo como se describe anteriormente. @@ -708,7 +708,7 @@ Traducións Pode enviar ficheiros de tradución novos ou editados a Bill Kendrick, responsábel do desenvolvemento de Tux Paint, a: bill@newbreedsoftware.com, ou publicalos na lista de correo - «tuxpaint-i18n» (vexa: http://www.tuxpaint.org/lists/). + «tuxpaint-i18n» (vexa: https://tuxpaint.org/lists/). Como alternativa, se te unha conta con SourceForge.net, pode solicitar que o engadan ao proxecto «tuxpaint» e recibir acceso de escritura ao diff --git a/docs/gl_ES.UTF-8/FAQ.txt b/docs/gl_ES.UTF-8/FAQ.txt index 95812e7d8..e55710ad1 100644 --- a/docs/gl_ES.UTF-8/FAQ.txt +++ b/docs/gl_ES.UTF-8/FAQ.txt @@ -1,10 +1,10 @@ Tux Paint versión 0.9.28 Preguntas máis frecuentes - Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 29 de Agosto de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- @@ -181,7 +181,7 @@ Problemas de interface Os tipos de letra axeitados para estas configuracións locais pódense descargar dende o sitio web de Tux Paint: - http://www.tuxpaint.org/download/fonts/ + https://tuxpaint.org/download/fonts/ ---------------------------------------------------------------------- @@ -666,7 +666,7 @@ Axuda / Contacto Para elo, pode subscribirse e publicar na nosa lista de correo «tuxpaint-users»: - http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/ Ou ,póñase en contacto directamente co responsábel do desenvolvemento Bill Kendrick: diff --git a/docs/gl_ES.UTF-8/INSTALL.txt b/docs/gl_ES.UTF-8/INSTALL.txt index c07e7cbb0..2d2c72bf6 100644 --- a/docs/gl_ES.UTF-8/INSTALL.txt +++ b/docs/gl_ES.UTF-8/INSTALL.txt @@ -2,10 +2,10 @@ versión 0.9.28 Documentación da instalación - Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 17 de Setembro de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- @@ -647,11 +647,11 @@ Compiling and Installation installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg. + $ sudo port install rust cargo $ git clone https://github.com/ImageOptim/libimagequant.git - $ cd libimagequant - $ ./configure --prefix=/opt/local - $ make - $ sudo make install + $ cd libimagequant/imagequant-sys + $ cargo build --release + $ sudo make PREFIX=/opt/local install WARNING: Having any UNIX-like toolset installed on your Mac besides MacPorts and Xcode, such as Fink or Brew, will prevent your app diff --git a/docs/gl_ES.UTF-8/OPTIONS.txt b/docs/gl_ES.UTF-8/OPTIONS.txt index f6b2bc2e2..a3ce7203e 100644 --- a/docs/gl_ES.UTF-8/OPTIONS.txt +++ b/docs/gl_ES.UTF-8/OPTIONS.txt @@ -3,10 +3,10 @@ Documentación de opcións - Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 29 de Agosto de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- @@ -465,6 +465,21 @@ Simplificación "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label". + nobrushspacing=yes + + Disables the brush spacing option of the Paint and Lines + tools. The brushes' default spacings will be used. + + Note: The brush spacing option was added to Tux Paint's user + interface in version 0.9.28. For more information on brush + spacing, see EXTENDING.html + + Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "nobrushspacing=no" or "brushspacing=yes". In both cases, + may be overridden by the command-line option + "--brushspacing". + ---------------------------------------------------------------------- Languages @@ -2013,9 +2028,9 @@ Tipos de letra especiais /usr/share/tuxpaint/fonts/locale/ko.ttf - Pode descargar os tipos de letra para os idiomas compatíbeis dende o - sitio web de Tux Paint, http://www.tuxpaint.org/.. (Mire na sección - «Tipos de letra» en «Descargas»). + You can download fonts for supported languages from Tux Paint's + website, https://tuxpaint.org/. (Look in the 'Fonts' section under + 'Download.') En Unix e Linux, pode usar o Makefile que vén co tipo de letra para instalalo no lugar adecuado. diff --git a/docs/gl_ES.UTF-8/PNG.txt b/docs/gl_ES.UTF-8/PNG.txt index 9cd065dcf..6bb6166bc 100644 --- a/docs/gl_ES.UTF-8/PNG.txt +++ b/docs/gl_ES.UTF-8/PNG.txt @@ -2,10 +2,10 @@ versión 0.9.28 Documentación PNG - Copyright © 2007-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2007-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 9 de Marzo de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt index 6340b2205..137a7f6dc 100644 --- a/docs/gl_ES.UTF-8/README.txt +++ b/docs/gl_ES.UTF-8/README.txt @@ -3,11 +3,11 @@ Un sinxelo programa de debuxo para cativos - Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ @TuxPaintTweets on Twitter - 25 de Novembro de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- @@ -246,6 +246,25 @@ Ferramentas dispoñíbeis Mentres debuxa, soa un son. Canto maior sexa o pincel, menor será o ton. + Espazado do pincel + + The space between each position where a brush is applied + to the canvas can vary. Some brushes (such as the + footprints and flower) are spaced, by default, far enough + apart that they don't overlap. Other brushes (such as the + basic circular ones) are spaced closely, so they make a + continuous stroke. + + The default spacing of brushes may be overridden using by + clicking within the triangular-shaped series of bars at + the bottom right; the larger the bar, the wider the + spacing. Brush spacing affects both tools that use the + brushes: the "Paint" tool and the "Lines" tool. + + (Note: If the "nobrushspacing" option is set, Tux Paint + won't display the brush spacing controls. See the + "Options" documentation.) + ---------------------------------------------------------------------- Ferramenta «Selo» (selos de caucho) @@ -314,6 +333,11 @@ Ferramentas dispoñíbeis finally some are both animated and directional. See "Paint", above, to learn more. + Different brushes have different spacing, leaving either a + series of individual shapes, or a continuous stroke of the + brush shape. Brush spacing may be adjusted. See "Paint", + above, to learn more. + ---------------------------------------------------------------------- Ferramenta «Formas» @@ -1056,7 +1080,7 @@ Importar imaxes manualmente * Ou póñase en contacto directamente cos desenvolvedores Para obter máis información, visite a páxina «Contacto» do sitio web - oficial de Tux Paint: http://tuxpaint.org/contact/ + oficial de Tux Paint: https://tuxpaint.org/contact/ ---------------------------------------------------------------------- @@ -1073,4 +1097,4 @@ Importar imaxes manualmente * Promover ou axudar a outras persoas a usar Tux Paint Para obter máis información, visite a páxina «Colabora connosco» do - sitio web oficial de Tux Paint: http://tuxpaint.org/help/ + sitio web oficial de Tux Paint: https://tuxpaint.org/help/ diff --git a/docs/gl_ES.UTF-8/SIGNALS.txt b/docs/gl_ES.UTF-8/SIGNALS.txt index c6f58f57e..8b368cd66 100644 --- a/docs/gl_ES.UTF-8/SIGNALS.txt +++ b/docs/gl_ES.UTF-8/SIGNALS.txt @@ -2,10 +2,10 @@ versión 0.9.28 Documentación de sinais - Copyright © 2019-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2019-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 9 de Marzo de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- diff --git a/docs/gl_ES.UTF-8/SVG.txt b/docs/gl_ES.UTF-8/SVG.txt index 71dcd13fe..13228cdc9 100644 --- a/docs/gl_ES.UTF-8/SVG.txt +++ b/docs/gl_ES.UTF-8/SVG.txt @@ -2,10 +2,10 @@ versión 0.9.28 Documentación SVG - Copyright © 2007-2021 por varios colaboradores; vexa AUTHORS (AUTORES). - http://www.tuxpaint.org/ + Copyright © 2007-2022 por varios colaboradores; vexa AUTHORS (AUTORES). + https://tuxpaint.org/ - 9 de Marzo de 2021 + 20 de Xaneiro de 2022 ---------------------------------------------------------------------- diff --git a/docs/gl_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html b/docs/gl_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html index bf9b32793..65ce25e40 100644 --- a/docs/gl_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/gl_ES.UTF-8/html/ADVANCED-STAMPS-HOWTO.html @@ -20,12 +20,12 @@ versión 0.9.28 «Como facer» os selos avanzados

- Copyright © 2006-2021 por Albert Cahalan e outros; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2006-2022 por Albert Cahalan e outros; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 29 de Agosto de 2021

+ 20 de Xaneiro de 2022

- Copyright © 2021-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2021-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 8 de Agosto de 2021

+ 20 de Xaneiro de 2022

diff --git a/docs/gl_ES.UTF-8/html/EXTENDING.html b/docs/gl_ES.UTF-8/html/EXTENDING.html index ed5b31a0e..e2f41bfe1 100644 --- a/docs/gl_ES.UTF-8/html/EXTENDING.html +++ b/docs/gl_ES.UTF-8/html/EXTENDING.html @@ -21,12 +21,12 @@ versión 0.9.28

- Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 19 de Setembro de 2021

+ 20 de Xaneiro de 2022

- Nota: É mellor traballar sempre co último modelo de catálogo de texto Tux Paint («tuxpaint.pot»), xa que se engade n novos textos e o texto antigo cambia ocasionalmente. O catálogo de texto para a próxima versión inédita de Tux Paint pódese atopar no repositorio Git de Tux Paint (ver: http://www.tuxpaint.org/download/source/git/) e no sitio web de Tux Paint en http://www.tuxpaint.org/help/po/.

+ Nota: É mellor traballar sempre co último modelo de catálogo de texto Tux Paint («tuxpaint.pot»), xa que se engade n novos textos e o texto antigo cambia ocasionalmente. O catálogo de texto para a próxima versión inédita de Tux Paint pódese atopar no repositorio Git de Tux Paint (ver: https://tuxpaint.org/download/source/git/) e no sitio web de Tux Paint en https://tuxpaint.org/help/po/.

Para editar unha tradución existente, descargue o último ficheiro «.po» para ese idioma e edíteo como se describe anteriormente.

- Pode enviar ficheiros de tradución novos ou editados a Bill Kendrick, responsábel do desenvolvemento de Tux Paint, a: bill@newbreedsoftware.com, ou publicalos na lista de correo «tuxpaint-i18n» (vexa: http://www.tuxpaint.org/lists/).

+ Pode enviar ficheiros de tradución novos ou editados a Bill Kendrick, responsábel do desenvolvemento de Tux Paint, a: bill@newbreedsoftware.com, ou publicalos na lista de correo «tuxpaint-i18n» (vexa: https://tuxpaint.org/lists/).

Como alternativa, se te unha conta con SourceForge.net, pode solicitar que o engadan ao proxecto «tuxpaint» e recibir acceso de escritura ao repositorio de código fonte de Git para que poida enviar os seus cambios directamente.

diff --git a/docs/gl_ES.UTF-8/html/FAQ.html b/docs/gl_ES.UTF-8/html/FAQ.html index e04093cd6..8828797fe 100644 --- a/docs/gl_ES.UTF-8/html/FAQ.html +++ b/docs/gl_ES.UTF-8/html/FAQ.html @@ -20,12 +20,12 @@ versión 0.9.28 Preguntas máis frecuentes

- Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 29 de Agosto de 2021

+ 20 de Xaneiro de 2022

http://www.tuxpaint.org/download/fonts/ + "https://tuxpaint.org/download/fonts/">https://tuxpaint.org/download/fonts/

@@ -822,7 +822,7 @@

- http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/

diff --git a/docs/gl_ES.UTF-8/html/INSTALL.html b/docs/gl_ES.UTF-8/html/INSTALL.html index b10005eba..c64a70313 100644 --- a/docs/gl_ES.UTF-8/html/INSTALL.html +++ b/docs/gl_ES.UTF-8/html/INSTALL.html @@ -21,12 +21,12 @@ Documentación da instalación

- Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 17 de Setembro de 2021

+ 20 de Xaneiro de 2022

@@ -797,11 +797,11 @@

libimagequant is not available from MacPorts as of this writing. It can be installed from the source code as follows. It should be installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg.

+ $ sudo port install rust cargo
$ git clone https://github.com/ImageOptim/libimagequant.git
- $ cd libimagequant
- $ ./configure --prefix=/opt/local
- $ make
- $ sudo make install + $ cd libimagequant/imagequant-sys
+ $ cargo build --release
+ $ sudo make PREFIX=/opt/local install

diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html index 2aa251354..1cd8067ca 100644 --- a/docs/gl_ES.UTF-8/html/OPTIONS.html +++ b/docs/gl_ES.UTF-8/html/OPTIONS.html @@ -20,12 +20,12 @@ Documentación de opcións

- Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 29 de Agosto de 2021

+ 20 de Xaneiro de 2022

Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nolabel=no" or "label=yes". In both cases, may be overridden by the command-line option "--label".

+ +
+ nobrushspacing=yes +
+ +
+

+ Disables the brush spacing option of the Paint and Lines tools. The brushes' default spacings will be used.

+

+ Note: The brush spacing option was added to Tux Paint's user interface in version 0.9.28. For more information on brush spacing, see EXTENDING.html

+

+ Note: If used in a system-wide configuration file, may be overridden by the user's configuration file using "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing".

+
@@ -5408,7 +5421,7 @@

- Pode descargar os tipos de letra para os idiomas compatíbeis dende o sitio web de Tux Paint, http://www.tuxpaint.org/.. (Mire na sección «Tipos de letra» en «Descargas»).

+ You can download fonts for supported languages from Tux Paint's website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

En Unix e Linux, pode usar o Makefile que vén co tipo de letra para instalalo no lugar adecuado.

diff --git a/docs/gl_ES.UTF-8/html/PNG.html b/docs/gl_ES.UTF-8/html/PNG.html index 9f7f70c50..e365103de 100644 --- a/docs/gl_ES.UTF-8/html/PNG.html +++ b/docs/gl_ES.UTF-8/html/PNG.html @@ -21,12 +21,12 @@ Documentación PNG

- Copyright © 2007-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2007-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 9 de Marzo de 2021

+ 20 de Xaneiro de 2022

diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html index d2f6d6bfa..ab0551d39 100644 --- a/docs/gl_ES.UTF-8/html/README.html +++ b/docs/gl_ES.UTF-8/html/README.html @@ -23,13 +23,13 @@ Un sinxelo programa de debuxo para cativos

- Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/
+ Copyright © 2002-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/
@TuxPaintTweets on Twitter

- 25 de Novembro de 2021

+ 20 de Xaneiro de 2022

+ Espazado do pincel +
+

+ The space between each position where a brush is applied to the canvas can vary. Some brushes (such as the footprints and flower) are spaced, by default, far enough apart that they don't overlap. Other brushes (such as the basic circular ones) are spaced closely, so they make a continuous stroke.

+

+ The default spacing of brushes may be overridden using by clicking within the triangular-shaped series of bars at the bottom right; the larger the bar, the wider the spacing. Brush spacing affects both tools that use the brushes: the "Paint" tool and the "Lines" tool.

+

+ +

+

+ (Note: If the "nobrushspacing" option is set, Tux Paint won't display the brush spacing controls. See the "Options" documentation.)

+
+
@@ -516,6 +533,9 @@

Some brushes are animated, and will show a pattern of shapes along the line. Others are directional, and will show a different shape depending on the angle of the brush. And finally some are both animated and directional. See "Paint", above, to learn more.

+ +

+ Different brushes have different spacing, leaving either a series of individual shapes, or a continuous stroke of the brush shape. Brush spacing may be adjusted. See "Paint", above, to learn more.


@@ -1151,6 +1171,14 @@

Nota: O axuste máis lento non avanza automaticamente entre as diapositivas. Úseo para cando queira percorrelas manualmente. (Isto non se aplica a un GIF animado exportado).

+ +

+ +

@@ -1467,7 +1495,7 @@

- Para obter máis información, visite a páxina «Contacto» do sitio web oficial de Tux Paint: http://tuxpaint.org/contact/

+ Para obter máis información, visite a páxina «Contacto» do sitio web oficial de Tux Paint: https://tuxpaint.org/contact/

- Para obter máis información, visite a páxina «Colabora connosco» do sitio web oficial de Tux Paint: http://tuxpaint.org/help/

+ Para obter máis información, visite a páxina «Colabora connosco» do sitio web oficial de Tux Paint: https://tuxpaint.org/help/

diff --git a/docs/gl_ES.UTF-8/html/SIGNALS.html b/docs/gl_ES.UTF-8/html/SIGNALS.html index f89ff177d..5798d1801 100644 --- a/docs/gl_ES.UTF-8/html/SIGNALS.html +++ b/docs/gl_ES.UTF-8/html/SIGNALS.html @@ -21,12 +21,12 @@ Documentación de sinais

- Copyright © 2019-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2019-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 9 de Marzo de 2021

+ 20 de Xaneiro de 2022

diff --git a/docs/gl_ES.UTF-8/html/SVG.html b/docs/gl_ES.UTF-8/html/SVG.html index 9e9011ecd..3d41a30b1 100644 --- a/docs/gl_ES.UTF-8/html/SVG.html +++ b/docs/gl_ES.UTF-8/html/SVG.html @@ -21,12 +21,12 @@ Documentación SVG

- Copyright © 2007-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
- http://www.tuxpaint.org/ + Copyright © 2007-2022 por varios colaboradores; vexa AUTHORS (AUTORES).
+ https://tuxpaint.org/

- 9 de Marzo de 2021

+ 20 de Xaneiro de 2022

diff --git a/docs/html/images/tool_slider.png b/docs/html/images/tool_slider.png new file mode 100644 index 000000000..2cfd61ec2 Binary files /dev/null and b/docs/html/images/tool_slider.png differ diff --git a/docs/ja_JP.UTF-8/ADVANCED-STAMPS-HOWTO.txt b/docs/ja_JP.UTF-8/ADVANCED-STAMPS-HOWTO.txt index e70da37f5..0c0516c11 100644 --- a/docs/ja_JP.UTF-8/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/ja_JP.UTF-8/ADVANCED-STAMPS-HOWTO.txt @@ -1,10 +1,10 @@ Tux Paint バージョン 0.9.28 スタンプ作成の詳細について - Copyright © 2006-2021 by Albert Cahalan ほか; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan ほか; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年8月29日 + 2022年1月20日 ---------------------------------------------------------------------- diff --git a/docs/ja_JP.UTF-8/ENVVARS.txt b/docs/ja_JP.UTF-8/ENVVARS.txt index 71c157261..ffbdbd7a3 100644 --- a/docs/ja_JP.UTF-8/ENVVARS.txt +++ b/docs/ja_JP.UTF-8/ENVVARS.txt @@ -2,10 +2,10 @@ バージョン 0.9.28 Environment Variables Documentation - Copyright © 2021-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年8月 8日 + 2022年1月20日 ---------------------------------------------------------------------- diff --git a/docs/ja_JP.UTF-8/EXTENDING.txt b/docs/ja_JP.UTF-8/EXTENDING.txt index 0c36a0b2f..e51a71b79 100644 --- a/docs/ja_JP.UTF-8/EXTENDING.txt +++ b/docs/ja_JP.UTF-8/EXTENDING.txt @@ -2,10 +2,10 @@ Tux Paint バージョン 0.9.28 - Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年9月19日 + 2022年1月20日 ---------------------------------------------------------------------- @@ -679,15 +679,15 @@ Translations template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: - http://www.tuxpaint.org/download/source/git/), and on the Tux Paint - website at http://www.tuxpaint.org/help/po/. + https://tuxpaint.org/download/source/git/), and on the Tux Paint website + at https://tuxpaint.org/help/po/. To edit an existing translation, download the latest ".po" file for that language, and edit it as described above. You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to - the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/). + the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/). Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access diff --git a/docs/ja_JP.UTF-8/FAQ.txt b/docs/ja_JP.UTF-8/FAQ.txt index 8099cb08f..eaec1ab2d 100644 --- a/docs/ja_JP.UTF-8/FAQ.txt +++ b/docs/ja_JP.UTF-8/FAQ.txt @@ -1,10 +1,10 @@ Tux Paint バージョン 0.9.28 Frequently Asked Questions - Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年8月29日 + 2022年1月20日 ---------------------------------------------------------------------- @@ -170,7 +170,7 @@ Interface Problems The appropriate fonts for such locales can be downloaded from the Tux Paint website: - http://www.tuxpaint.org/download/fonts/ + https://tuxpaint.org/download/fonts/ ---------------------------------------------------------------------- @@ -637,7 +637,7 @@ Help / Contact Any questions you don't see answered? Please let us know! You can subscribe and post to our "tuxpaint-users" mailing list: - http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/ Or, contact lead developer Bill Kendrick directly: diff --git a/docs/ja_JP.UTF-8/INSTALL.txt b/docs/ja_JP.UTF-8/INSTALL.txt index b11e043d0..18e9afc1d 100644 --- a/docs/ja_JP.UTF-8/INSTALL.txt +++ b/docs/ja_JP.UTF-8/INSTALL.txt @@ -2,10 +2,10 @@ バージョン 0.9.28 Installation Documentation - Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年9月17日 + 2022年1月20日 ---------------------------------------------------------------------- @@ -637,11 +637,11 @@ Compiling and Installation installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg. + $ sudo port install rust cargo $ git clone https://github.com/ImageOptim/libimagequant.git - $ cd libimagequant - $ ./configure --prefix=/opt/local - $ make - $ sudo make install + $ cd libimagequant/imagequant-sys + $ cargo build --release + $ sudo make PREFIX=/opt/local install WARNING: Having any UNIX-like toolset installed on your Mac besides MacPorts and Xcode, such as Fink or Brew, will prevent your app diff --git a/docs/ja_JP.UTF-8/OPTIONS.txt b/docs/ja_JP.UTF-8/OPTIONS.txt index 552602ff9..9647842e0 100644 --- a/docs/ja_JP.UTF-8/OPTIONS.txt +++ b/docs/ja_JP.UTF-8/OPTIONS.txt @@ -3,10 +3,10 @@ 各種設定について - Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年8月29日 + 2022年1月20日 ---------------------------------------------------------------------- @@ -366,6 +366,20 @@ Windows のユーザー "label=yes" を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--label" で変更できます。 + nobrushspacing=yes + + Disables the brush spacing option of the Paint and Lines + tools. The brushes' default spacings will be used. + + Note: The brush spacing option was added to Tux Paint's user + interface in version 0.9.28. For more information on brush + spacing, see EXTENDING.html + + 注：システム全体の設定ファイルで設定されている場合は、ユーザーの設定ファイルで "nobrushspacing=no" + または "brushspacing=yes" + を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの + "--brushspacing" で変更できます。 + ---------------------------------------------------------------------- 言語関連 @@ -1712,8 +1726,9 @@ Windows のユーザー /usr/share/tuxpaint/fonts/locale/ko.ttf - サポートされる言語用のフォントファイルは、Tux Paint のウェブサイト http://www.tuxpaint.org/ - からダウンロードできます。（'ダウンロード' ページの 'フォント' セクションにあります） + You can download fonts for supported languages from Tux Paint's + website, https://tuxpaint.org/. (Look in the 'Fonts' section under + 'Download.') Unix や Linux では、同梱の Makefile を使って、適切な場所にフォントをインストールすることができます。 diff --git a/docs/ja_JP.UTF-8/PNG.txt b/docs/ja_JP.UTF-8/PNG.txt index e5bcadce0..4be03f36e 100644 --- a/docs/ja_JP.UTF-8/PNG.txt +++ b/docs/ja_JP.UTF-8/PNG.txt @@ -2,10 +2,10 @@ バージョン 0.9.28 PNG Documentation - Copyright © 2007-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年3月 9日 + 2022年1月20日 ---------------------------------------------------------------------- diff --git a/docs/ja_JP.UTF-8/README.txt b/docs/ja_JP.UTF-8/README.txt index 13a8dd4ca..5b3b5db25 100644 --- a/docs/ja_JP.UTF-8/README.txt +++ b/docs/ja_JP.UTF-8/README.txt @@ -3,11 +3,11 @@ 子供向けのシンプルなお絵かきプログラム - Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ @TuxPaintTweets on Twitter - 2021年11月25日 + 2022年1月20日 ---------------------------------------------------------------------- @@ -183,6 +183,25 @@ Tux Paint の起動 描画中にはサウンドが流れます。筆の大きさが大きいほど、低い音になります。 + Brush Spacing + + The space between each position where a brush is applied + to the canvas can vary. Some brushes (such as the + footprints and flower) are spaced, by default, far enough + apart that they don't overlap. Other brushes (such as the + basic circular ones) are spaced closely, so they make a + continuous stroke. + + The default spacing of brushes may be overridden using by + clicking within the triangular-shaped series of bars at + the bottom right; the larger the bar, the wider the + spacing. Brush spacing affects both tools that use the + brushes: the "Paint" tool and the "Lines" tool. + + (Note: If the "nobrushspacing" option is set, Tux Paint + won't display the brush spacing controls. See the + "Options" documentation.) + ---------------------------------------------------------------------- 「はんこ」ツール @@ -218,6 +237,11 @@ Tux Paint の起動 アニメーション対応のブラシでは、線に沿って形が変化します。 指向性のブラシでは、線の角度に応じて異なる形状を表示します。 さらに、アニメーションと指向性の両方を備えたブラシもあります。 詳しくは、上記の「ふで」の項をご覧ください。 + Different brushes have different spacing, leaving either a + series of individual shapes, or a continuous stroke of the + brush shape. Brush spacing may be adjusted. See "Paint", + above, to learn more. + ---------------------------------------------------------------------- 「かたち」ツール @@ -719,7 +743,7 @@ Tux Paint の起動 * 開発者へ直接連絡することもできます もっとお知りになりたい場合、Tux Paint のウェブサイト の "連絡先" のページ - (http://tuxpaint.org/contact/) をごらん下さい + (https://tuxpaint.org/contact/) をごらん下さい ---------------------------------------------------------------------- @@ -735,4 +759,4 @@ Tux Paint の起動 * 宣伝や、他の Tux Paint ユーザーのサポート もっとお知りになりたい場合、Tux Paint のウェブサイト の "私たちにご協力を" のページ - (http://tuxpaint.org/help/) をごらん下さい + (https://tuxpaint.org/help/) をごらん下さい diff --git a/docs/ja_JP.UTF-8/SIGNALS.txt b/docs/ja_JP.UTF-8/SIGNALS.txt index 5a92b29b6..34a23efbb 100644 --- a/docs/ja_JP.UTF-8/SIGNALS.txt +++ b/docs/ja_JP.UTF-8/SIGNALS.txt @@ -2,10 +2,10 @@ バージョン 0.9.28 Signals Documentation - Copyright © 2019-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年3月 9日 + 2022年1月20日 ---------------------------------------------------------------------- diff --git a/docs/ja_JP.UTF-8/SVG.txt b/docs/ja_JP.UTF-8/SVG.txt index aa8bbf28e..07b620a45 100644 --- a/docs/ja_JP.UTF-8/SVG.txt +++ b/docs/ja_JP.UTF-8/SVG.txt @@ -2,10 +2,10 @@ バージョン 0.9.28 SVG Documentation - Copyright © 2007-2021 by various contributors; "AUTHORS" 参照. - http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; "AUTHORS" 参照. + https://tuxpaint.org/ - 2021年3月 9日 + 2022年1月20日 ---------------------------------------------------------------------- diff --git a/docs/ja_JP.UTF-8/html/ADVANCED-STAMPS-HOWTO.html b/docs/ja_JP.UTF-8/html/ADVANCED-STAMPS-HOWTO.html index 5809837f6..e6bd462fb 100644 --- a/docs/ja_JP.UTF-8/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/ja_JP.UTF-8/html/ADVANCED-STAMPS-HOWTO.html @@ -20,12 +20,12 @@ バージョン 0.9.28 スタンプ作成の詳細について

- Copyright © 2006-2021 by Albert Cahalan ほか; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2006-2022 by Albert Cahalan ほか; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年8月29日

+ 2022年1月20日

- Copyright © 2021-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2021-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年8月 8日

+ 2022年1月20日

diff --git a/docs/ja_JP.UTF-8/html/EXTENDING.html b/docs/ja_JP.UTF-8/html/EXTENDING.html index c9ea397f7..1cb3f1751 100644 --- a/docs/ja_JP.UTF-8/html/EXTENDING.html +++ b/docs/ja_JP.UTF-8/html/EXTENDING.html @@ -21,12 +21,12 @@ バージョン 0.9.28

- Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年9月19日

+ 2022年1月20日

- Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: http://www.tuxpaint.org/download/source/git/), and on the Tux Paint website at http://www.tuxpaint.org/help/po/.

+ Note: It is best to always work off of the latest Tux Paint text catalog template ("tuxpaint.pot"), since new text is added, and old text is occasionally changed. The text catalog for the upcoming, unreleased version of Tux Paint can be found in Tux Paint's Git repository (see: https://tuxpaint.org/download/source/git/), and on the Tux Paint website at https://tuxpaint.org/help/po/.

To edit an existing translation, download the latest ".po" file for that language, and edit it as described above.

- You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: http://www.tuxpaint.org/lists/).

+ You may send new or edited translation files to Bill Kendrick, lead developer of Tux Paint, at: bill@newbreedsoftware.com, or post them to the "tuxpaint-i18n" mailing list (see: https://tuxpaint.org/lists/).

Alternatively, if you have an account with SourceForge.net, you can request to be added to the "tuxpaint" project and receive write-access to the Git source code repository so that you may commit your changes directly.

diff --git a/docs/ja_JP.UTF-8/html/FAQ.html b/docs/ja_JP.UTF-8/html/FAQ.html index 102ce8622..80b1e5ffd 100644 --- a/docs/ja_JP.UTF-8/html/FAQ.html +++ b/docs/ja_JP.UTF-8/html/FAQ.html @@ -20,12 +20,12 @@ バージョン 0.9.28 Frequently Asked Questions

- Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年8月29日

+ 2022年1月20日

http://www.tuxpaint.org/download/fonts/ + "https://tuxpaint.org/download/fonts/">https://tuxpaint.org/download/fonts/

@@ -822,7 +822,7 @@

- http://www.tuxpaint.org/lists/ + https://tuxpaint.org/lists/

diff --git a/docs/ja_JP.UTF-8/html/INSTALL.html b/docs/ja_JP.UTF-8/html/INSTALL.html index e40dc559a..2ebda8c04 100644 --- a/docs/ja_JP.UTF-8/html/INSTALL.html +++ b/docs/ja_JP.UTF-8/html/INSTALL.html @@ -21,12 +21,12 @@ Installation Documentation

- Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年9月17日

+ 2022年1月20日

@@ -797,11 +797,11 @@

libimagequant is not available from MacPorts as of this writing. It can be installed from the source code as follows. It should be installed to /opt/local (same as MacPorts) for the library to be included in TuxPaint.dmg.

+ $ sudo port install rust cargo
$ git clone https://github.com/ImageOptim/libimagequant.git
- $ cd libimagequant
- $ ./configure --prefix=/opt/local
- $ make
- $ sudo make install + $ cd libimagequant/imagequant-sys
+ $ cargo build --release
+ $ sudo make PREFIX=/opt/local install

diff --git a/docs/ja_JP.UTF-8/html/OPTIONS.html b/docs/ja_JP.UTF-8/html/OPTIONS.html index 3227029b6..43d97e954 100644 --- a/docs/ja_JP.UTF-8/html/OPTIONS.html +++ b/docs/ja_JP.UTF-8/html/OPTIONS.html @@ -20,12 +20,12 @@ 各種設定について

- Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2002-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年8月29日

+ 2022年1月20日

注：システム全体の設定ファイルで設定されている場合は、ユーザーの設定ファイルで "nolabel=no" または "label=yes" を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--label" で変更できます。

+ +
+ nobrushspacing=yes +
+ +
+

+ Disables the brush spacing option of the Paint and Lines tools. The brushes' default spacings will be used.

+

+ Note: The brush spacing option was added to Tux Paint's user interface in version 0.9.28. For more information on brush spacing, see EXTENDING.html

+

+ 注：システム全体の設定ファイルで設定されている場合は、ユーザーの設定ファイルで "nobrushspacing=no" または "brushspacing=yes" を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--brushspacing" で変更できます。

+
@@ -5408,7 +5421,7 @@

- サポートされる言語用のフォントファイルは、Tux Paint のウェブサイト http://www.tuxpaint.org/ からダウンロードできます。（'ダウンロード' ページの 'フォント' セクションにあります）

+ You can download fonts for supported languages from Tux Paint's website, https://tuxpaint.org/. (Look in the 'Fonts' section under 'Download.')

Unix や Linux では、同梱の Makefile を使って、適切な場所にフォントをインストールすることができます。

diff --git a/docs/ja_JP.UTF-8/html/PNG.html b/docs/ja_JP.UTF-8/html/PNG.html index f134f9515..ab92680c1 100644 --- a/docs/ja_JP.UTF-8/html/PNG.html +++ b/docs/ja_JP.UTF-8/html/PNG.html @@ -21,12 +21,12 @@ PNG Documentation

- Copyright © 2007-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年3月 9日

+ 2022年1月20日

diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html index 65c28eb37..da0b8392f 100644 --- a/docs/ja_JP.UTF-8/html/README.html +++ b/docs/ja_JP.UTF-8/html/README.html @@ -23,13 +23,13 @@ 子供向けのシンプルなお絵かきプログラム

- Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/
+ Copyright © 2002-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/
@TuxPaintTweets on Twitter

- 2021年11月25日

+ 2022年1月20日

+ Brush Spacing +
+

+ The space between each position where a brush is applied to the canvas can vary. Some brushes (such as the footprints and flower) are spaced, by default, far enough apart that they don't overlap. Other brushes (such as the basic circular ones) are spaced closely, so they make a continuous stroke.

+

+ The default spacing of brushes may be overridden using by clicking within the triangular-shaped series of bars at the bottom right; the larger the bar, the wider the spacing. Brush spacing affects both tools that use the brushes: the "Paint" tool and the "Lines" tool.

+

+ +

+

+ (Note: If the "nobrushspacing" option is set, Tux Paint won't display the brush spacing controls. See the "Options" documentation.)

+
+
@@ -516,6 +533,9 @@

アニメーション対応のブラシでは、線に沿って形が変化します。 指向性のブラシでは、線の角度に応じて異なる形状を表示します。 さらに、アニメーションと指向性の両方を備えたブラシもあります。 詳しくは、上記の「ふで」の項をご覧ください。

+ +

+ Different brushes have different spacing, leaving either a series of individual shapes, or a continuous stroke of the brush shape. Brush spacing may be adjusted. See "Paint", above, to learn more.


@@ -1151,6 +1171,14 @@

注: 最も遅いスピードに設定するとスライドの自動進行が無効になります。１枚ずつ手動でスライドを進めたい場合に、この設定を用いてください。（この動作はアニメーションGIFには適用されません）

+ +

+ +

@@ -1467,7 +1495,7 @@

- もっとお知りになりたい場合、Tux Paint のウェブサイト の "連絡先" のページ (http://tuxpaint.org/contact/) をごらん下さい

+ もっとお知りになりたい場合、Tux Paint のウェブサイト の "連絡先" のページ (https://tuxpaint.org/contact/) をごらん下さい

- もっとお知りになりたい場合、Tux Paint のウェブサイト の "私たちにご協力を" のページ (http://tuxpaint.org/help/) をごらん下さい

+ もっとお知りになりたい場合、Tux Paint のウェブサイト の "私たちにご協力を" のページ (https://tuxpaint.org/help/) をごらん下さい

diff --git a/docs/ja_JP.UTF-8/html/SIGNALS.html b/docs/ja_JP.UTF-8/html/SIGNALS.html index b53664a35..fe28a739f 100644 --- a/docs/ja_JP.UTF-8/html/SIGNALS.html +++ b/docs/ja_JP.UTF-8/html/SIGNALS.html @@ -21,12 +21,12 @@ Signals Documentation

- Copyright © 2019-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2019-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年3月 9日

+ 2022年1月20日

diff --git a/docs/ja_JP.UTF-8/html/SVG.html b/docs/ja_JP.UTF-8/html/SVG.html index 50bf855fb..f66d65814 100644 --- a/docs/ja_JP.UTF-8/html/SVG.html +++ b/docs/ja_JP.UTF-8/html/SVG.html @@ -21,12 +21,12 @@ SVG Documentation

- Copyright © 2007-2021 by various contributors; "AUTHORS" 参照.
- http://www.tuxpaint.org/ + Copyright © 2007-2022 by various contributors; "AUTHORS" 参照.
+ https://tuxpaint.org/

- 2021年3月 9日

+ 2022年1月20日

diff --git a/macos/build-app.sh b/macos/build-app.sh index b0a9325aa..e8056f271 100755 --- a/macos/build-app.sh +++ b/macos/build-app.sh @@ -34,7 +34,7 @@ dylib="$BINARY $LIBS" count=0; last=-1 echo " * Copying Shared Libraries..." while [ $count -ne $last ]; do - cp -p `otool -L $dylib | grep '^\t[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/' | sort | uniq` $LIBDIR + cp -p `otool -L $dylib | grep '^[[:space:]]*[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/' | sort | uniq` $LIBDIR dylib="$LIBDIR/*" last=$count @@ -48,7 +48,7 @@ echo " -> Copied" $count "files to $LIBDIR" echo " * Fixing Shared Library References..." for i in "$BINARY" $LIBS $LIBDIR/*; do echo " -> $i..." - for j in `otool -L $dylib | grep '^\t[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/'`; do + for j in `otool -L $dylib | grep '^[[:space:]]*[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/'`; do n=`echo "$j" | sed 's/^[/]opt[/]local[/]/@executable_path\/..\//'` install_name_tool -change "$j" "$n" "$i" done @@ -62,7 +62,7 @@ for i in "$BINARY" $LIBS $LIBDIR/*; do # # https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7 # - if [ `otool -L "$i" | grep -c '^\t\/System\/Library\/Frameworks\/CoreGraphics\.framework\/Versions\/A\/CoreGraphics'` -gt 0 ]; then + if [ `otool -L "$i" | grep -c '^[[:space:]]*\/System\/Library\/Frameworks\/CoreGraphics\.framework\/Versions\/A\/CoreGraphics'` -gt 0 ]; then defaultlib="/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics" compatlib="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics" install_name_tool -change "$defaultlib" "$compatlib" "$i" diff --git a/magic/docs/en/README.txt b/magic/docs/en/README.txt index ebca41f46..5ecd743bb 100644 --- a/magic/docs/en/README.txt +++ b/magic/docs/en/README.txt @@ -1,9 +1,9 @@ Creating Tux Paint Magic Tool Plugins - Copyright 2007-2021 by various contributors; see AUTHORS.txt - http://www.tuxpaint.org/ + Copyright 2007-2022 by various contributors; see AUTHORS.txt + https://tuxpaint.org/ - July 5, 2007 - September 21, 2021 + July 5, 2007 - January 20, 2022 ---------------------------------------------------------------------- @@ -966,12 +966,12 @@ Example Code Getting Help For more information, check the Tux Paint website: - http://www.tuxpaint.org/, and the Simple DirectMedia Layer library - website: http://www.libsdl.org/. + https://tuxpaint.org/, and the Simple DirectMedia Layer library website: + http://www.libsdl.org/. Additionally, other Tux Paint developers and users can be found on the "tuxpaint-devel" and "tuxpaint-users" mailing lists: - http://www.tuxpaint.org/lists/. + https://tuxpaint.org/lists/. ---------------------------------------------------------------------- diff --git a/magic/docs/en/html/README.html b/magic/docs/en/html/README.html index 74c0c826e..6646d45d3 100644 --- a/magic/docs/en/html/README.html +++ b/magic/docs/en/html/README.html @@ -3,16 +3,18 @@ + +

Creating Tux Paint Magic Tool Plugins

-

Copyright 2007-2021 by various contributors; see AUTHORS.txt
-http://www.tuxpaint.org/

+

Copyright 2007-2022 by various contributors; see AUTHORS.txt
+https://tuxpaint.org/

-

July 5, 2007 - September 21, 2021

+

July 5, 2007 - January 20, 2022

@@ -1251,14 +1253,14 @@ simply be '1', your arrays will be of length '1', etc.)

For more information, check the Tux Paint website: -http://www.tuxpaint.org/, +https://tuxpaint.org/, and the Simple DirectMedia Layer library website: http://www.libsdl.org/.

Additionally, other Tux Paint developers and users can be found on the "tuxpaint-devel" and "tuxpaint-users" mailing lists: -http://www.tuxpaint.org/lists/.

+https://tuxpaint.org/lists/.

diff --git a/man/en/tuxpaint.1 b/man/en/tuxpaint.1 index d5b84861c..d2c12d375 100644 --- a/man/en/tuxpaint.1 +++ b/man/en/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2021.11.25 -.TH TUXPAINT 1 "November 25, 2021" "0.9.28" "Tux Paint" +.\" tuxpaint.1 - 2022.01.20 +.TH TUXPAINT 1 "January 20, 2022" "0.9.28" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -71,6 +71,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nolabel] .br +[\-\-nobrushspacing] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -213,6 +215,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-label] .br +[\-\-brushspacing] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -419,6 +423,11 @@ initially clicked. Disable or enable (default) the Label tool, which lets you create text which can be altered or moved later. +.TP 8 +.B \-\-nobrushspacing \-\-brushspacing +Disable or enable (default) the brush spacing option of the Paint and Lines +tools, which allows you to override the default spacing of a brush. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux @@ -1272,7 +1281,7 @@ See the documentation that comes with Tux Paint for further instructions on usin The canonical place to find Tux Paint information is at .nh -http://www.tuxpaint.org/. +https://tuxpaint.org/. .hy .SH AUTHORS diff --git a/man/es_ES.UTF-8/tuxpaint.1 b/man/es_ES.UTF-8/tuxpaint.1 index e66d6c105..7e484bea0 100644 --- a/man/es_ES.UTF-8/tuxpaint.1 +++ b/man/es_ES.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2021.11.25 -.TH TUXPAINT 1 "noviembre 25, 2021" "0.9.28" "Tux Paint" +.\" tuxpaint.1 - 2022.01.20 +.TH TUXPAINT 1 "enero 20, 2022" "0.9.28" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -71,6 +71,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nolabel] .br +[\-\-nobrushspacing] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -213,6 +215,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-label] .br +[\-\-brushspacing] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -419,6 +423,11 @@ initially clicked. Disable or enable (default) the Label tool, which lets you create text which can be altered or moved later. +.TP 8 +.B \-\-nobrushspacing \-\-brushspacing +Disable or enable (default) the brush spacing option of the Paint and Lines +tools, which allows you to override the default spacing of a brush. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux @@ -1272,7 +1281,7 @@ See the documentation that comes with Tux Paint for further instructions on usin The canonical place to find Tux Paint information is at .nh -http://www.tuxpaint.org/. +https://tuxpaint.org/. .hy .SH AUTHORS diff --git a/man/fr_FR.UTF-8/tuxpaint.1 b/man/fr_FR.UTF-8/tuxpaint.1 index faf4c71e7..47d73b630 100644 --- a/man/fr_FR.UTF-8/tuxpaint.1 +++ b/man/fr_FR.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2021.11.25 -.TH TUXPAINT 1 "novembre 25, 2021" "0.9.28" "Tux Paint" +.\" tuxpaint.1 - 2022.01.20 +.TH TUXPAINT 1 "janvier 20, 2022" "0.9.28" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. @@ -71,6 +71,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. .br [\-\-nolabel] .br +[\-\-nobrushspacing] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -213,6 +215,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. .br [\-\-label] .br +[\-\-brushspacing] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -429,6 +433,11 @@ partir d'un coin, là où la souris a cliqué en premier. Désactive (ou active) l'outil Étiquette, ce qui vous permet de créer un texte qui peut être modifié ou déplacé plus tard. +.TP 8 +.B \-\-nobrushspacing \-\-brushspacing +Disable or enable (default) the brush spacing option of the Paint and Lines +tools, which allows you to override the default spacing of a brush. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepte les options suivantes pour modifier la manière dont @@ -1312,7 +1321,7 @@ Voyez la documentation venant avec Tux Paint pour d'autres instructions concerna L'endroit normal pour trouver les informations sur Tux Paint se trouve à .nh -http://www.tuxpaint.org/. +https://tuxpaint.org/. .hy .SH AUTHORS diff --git a/man/gl_ES.UTF-8/tuxpaint.1 b/man/gl_ES.UTF-8/tuxpaint.1 index 0e4f8d4b1..e24ed9314 100644 --- a/man/gl_ES.UTF-8/tuxpaint.1 +++ b/man/gl_ES.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2021.11.25 -.TH TUXPAINT 1 "25 de Novembro de 2021" "0.9.28" "Tux Paint" +.\" tuxpaint.1 - 2022.01.20 +.TH TUXPAINT 1 "20 de Xaneiro de 2022" "0.9.28" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -71,6 +71,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nolabel] .br +[\-\-nobrushspacing] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -213,6 +215,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-label] .br +[\-\-brushspacing] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -419,6 +423,11 @@ initially clicked. Disable or enable (default) the Label tool, which lets you create text which can be altered or moved later. +.TP 8 +.B \-\-nobrushspacing \-\-brushspacing +Disable or enable (default) the brush spacing option of the Paint and Lines +tools, which allows you to override the default spacing of a brush. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux @@ -1276,7 +1285,7 @@ See the documentation that comes with Tux Paint for further instructions on usin The canonical place to find Tux Paint information is at .nh -http://www.tuxpaint.org/. +https://tuxpaint.org/. .hy .SH AUTHORS diff --git a/man/ja_JP.UTF-8/tuxpaint.1 b/man/ja_JP.UTF-8/tuxpaint.1 index 5b1b9f4e1..be544891e 100644 --- a/man/ja_JP.UTF-8/tuxpaint.1 +++ b/man/ja_JP.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2021.11.25 -.TH TUXPAINT 1 "2021年11月25日" "0.9.28" "Tux Paint" +.\" tuxpaint.1 - 2022.01.20 +.TH TUXPAINT 1 "2022年1月20日" "0.9.28" "Tux Paint" .SH NAME tuxpaint -- 小さな子供向けのお絵かきプログラム @@ -71,6 +71,8 @@ tuxpaint -- 小さな子供向けのお絵かきプログラム .br [\-\-nolabel] .br +[\-\-nobrushspacing] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -213,6 +215,8 @@ tuxpaint -- 小さな子供向けのお絵かきプログラム .br [\-\-label] .br +[\-\-brushspacing] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -419,6 +423,11 @@ initially clicked. Disable or enable (default) the Label tool, which lets you create text which can be altered or moved later. +.TP 8 +.B \-\-nobrushspacing \-\-brushspacing +Disable or enable (default) the brush spacing option of the Paint and Lines +tools, which allows you to override the default spacing of a brush. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux @@ -1275,7 +1284,7 @@ See the documentation that comes with Tux Paint for further instructions on usin The canonical place to find Tux Paint information is at .nh -http://www.tuxpaint.org/. +https://tuxpaint.org/. .hy .SH AUTHORS diff --git a/src/parse.gperf b/src/parse.gperf index 54f18d422..415b9bd12 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -120,6 +120,7 @@ help, IMM(help) hidecursor, POSBOOL(hide_cursor) keyboard, POSBOOL(keymouse) label, NEGBOOL(disable_label) +brushspacing, NEGBOOL(disable_brushspacing) lang, MULTI(parsertmp_lang) locale, MULTI(parsertmp_locale) lockfile, POSBOOL(ok_to_use_lockfile) diff --git a/src/parse.h b/src/parse.h index 237337992..308ad7590 100644 --- a/src/parse.h +++ b/src/parse.h @@ -14,6 +14,7 @@ struct cfginfo const char *colorfile; const char *datadir; const char *disable_label; + const char *disable_brushspacing; const char *disable_magic_controls; const char *disable_shape_controls; const char *disable_print; diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash index c749cdada..4f0acfbcd 100644 --- a/src/tuxpaint-completion.bash +++ b/src/tuxpaint-completion.bash @@ -3,7 +3,7 @@ # Bill Kendrick ; http://www.tuxpaint.org/ # Based on inkscape's completion file, by allali@univ-mlv.fr # -# Last modified 2021-08-07 +# Last modified 2022-01-18 # # $Id$ @@ -40,6 +40,7 @@ _tuxpaint() --complexshapes -s --simpleshapes \ -m --mixedcase -u --uppercase \ --label --nolabel \ + --brushspacing --nobrushspacing \ --fancycursors --nofancycursors \ --hidecursor --showcursor \ --mouse --keyboard \ diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 24ba73ef8..20a12ec5b 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -3,7 +3,7 @@ Tux Paint - A simple drawing program for children. - Copyright (c) 2002-2021 + Copyright (c) 2002-2022 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - November 15, 2021 + June 14, 2002 - January 19, 2022 */ #include "platform.h" @@ -1369,6 +1369,8 @@ static int starter_personal; static int template_personal; static int starter_modified; +static int disable_brushspacing; + static Uint8 canvas_color_r, canvas_color_g, canvas_color_b; static Uint8 *touched; static Uint8 *sim_flood_touched; @@ -1980,6 +1982,12 @@ static int brush_counter, brush_frame; #define ERASER_MIN 5 /* Smaller than 5 will not render as a circle! */ #define ERASER_MAX 128 +#define BRUSH_SPACING_SIZES 12 /* How many brush spacing options to provide + (max will represent BRUSH_SPACING_MAX_MULTIPLIER times the + max dimension of the brush; min will represent 1 pixel) */ +#define BRUSH_SPACING_MAX_MULTIPLIER 5 /* How far apart (in terms of a multiplier of a + brush's dimensions) the max brush spacing setting + represents */ static unsigned cur_color; static int cur_tool, cur_brush, old_tool; @@ -2068,6 +2076,7 @@ static SDL_Surface *do_loadimage(const char *const fname, int abort_on_error); static void draw_toolbar(void); static void draw_magic(void); static void draw_brushes(void); +static void draw_brushes_spacing(void); static void draw_stamps(void); static void draw_shapes(void); static void draw_erasers(void); @@ -2081,6 +2090,7 @@ static void render_brush(void); static void _xorpixel(SDL_Surface * surf, int x, int y); static void line_xor(int x1, int y1, int x2, int y2); static void rect_xor(int x1, int y1, int x2, int y2); +static void circle_xor(int x, int y, int sz); static void draw_blinking_cursor(void); static void hide_blinking_cursor(void); @@ -3766,6 +3776,7 @@ static void mainloop(void) } else if ((event.button.y < r_tools.y + button_h / 2) && tool_scroll > 0) { + /* Tool up scroll button */ tool_scroll -= gd_tools.cols; playsound(screen, 1, SND_SCROLL, 1, SNDPOS_CENTER, SNDDIST_NEAR); @@ -3776,6 +3787,7 @@ static void mainloop(void) else if ((event.button.y > real_r_tools.y + real_r_tools.h) && (tool_scroll < NUM_TOOLS - buttons_tall * gd_tools.cols + gd_tools.cols)) { + /* Tool down scroll button */ tool_scroll += gd_tools.cols; draw_toolbar(); playsound(screen, 1, SND_SCROLL, 1, SNDPOS_CENTER, SNDDIST_NEAR); @@ -3818,13 +3830,13 @@ static void mainloop(void) { if (!disable_stamp_controls) { - /* was 2,2 before adding left/right stamp group buttons -bjk 2007.05.15 */ + /* Account for stamp controls and group changing (left/right) buttons */ gd_controls.rows = 3; gd_controls.cols = 2; } else { - /* was left 0,0 before adding left/right stamp group buttons -bjk 2007.05.03 */ + /* Stamp controls are disabled; account for group changing (left/right) buttons */ gd_controls.rows = 1; gd_controls.cols = 2; } @@ -3833,6 +3845,7 @@ static void mainloop(void) { if (!disable_stamp_controls) { + /* Account for text controls */ gd_controls.rows = 2; gd_controls.cols = 2; } @@ -3841,11 +3854,13 @@ static void mainloop(void) { if (!disable_stamp_controls) { + /* Account for text controls and label selection button */ gd_controls.rows = 3; gd_controls.cols = 2; } else { + /* Text controls disabled; only account for label selection button */ gd_controls.rows = 1; gd_controls.cols = 2; } @@ -3855,11 +3870,13 @@ static void mainloop(void) { if (!disable_magic_controls) { + /* Account for magic controls and group changing (left/right) buttons */ gd_controls.rows = 2; gd_controls.cols = 2; } else { + /* Magic controls are disabled; account for group changing (left/right) buttons */ gd_controls.rows = 1; gd_controls.cols = 2; } @@ -3869,6 +3886,17 @@ static void mainloop(void) { if (!disable_shape_controls) { + /* Account for shape controls (corner- vs center-based expansion) */ + gd_controls.rows = 1; + gd_controls.cols = 2; + } + } + + else if (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) + { + if (!disable_brushspacing) + { + /* Account for brush spacing */ gd_controls.rows = 1; gd_controls.cols = 2; } @@ -3907,10 +3935,12 @@ static void mainloop(void) if (HIT(r_items)) { + /* A selection button was clicked... */ which = GRIDHIT_GD(r_items, gd_items) + *thing_scroll; if (which < num_things) { + /* ...and there was something there to click */ toolopt_changed = 1; #ifndef NOSOUND if (cur_tool != TOOL_STAMP || stamp_data[stamp_group][which]->ssnd == NULL) @@ -3924,7 +3954,10 @@ static void mainloop(void) } else if (HIT(r_controls)) { + /* Controls were clicked */ + which = GRIDHIT_GD(r_controls, gd_controls); + if (cur_tool == TOOL_STAMP) { /* Stamp controls! */ @@ -4045,6 +4078,8 @@ static void mainloop(void) } else if (cur_tool == TOOL_MAGIC) { + /* Magic controls */ + int grp; int cur; @@ -4233,10 +4268,9 @@ static void mainloop(void) } } } - - /* Label controls! */ else if (cur_tool == TOOL_LABEL) { + /* Label controls! */ int control_sound = -1; if (which & 4) @@ -4379,12 +4413,42 @@ static void mainloop(void) } draw_fonts(); update_screen_rect(&r_toolopt); + } + else if (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) + { + /* Brush spacing */ + int prev_size, chosen, new_size, frame_w, w, h, control_sound; + + prev_size = brushes_spacing[cur_brush]; + chosen = ((BRUSH_SPACING_SIZES + 1) * (event.button.x - r_ttoolopt.x)) / r_ttoolopt.w; + + frame_w = img_brushes[cur_brush]->w / abs(brushes_frames[cur_brush]); + w = frame_w / (brushes_directional[cur_brush] ? 3 : 1); + h = img_brushes[cur_brush]->h / (brushes_directional[cur_brush] ? 3 : 1); + + /* Spacing ranges from 0px to "N x the max dimension of the brush" + (so a 48x48 brush would have a spacing of 48 if the center option is chosen) */ + new_size = (chosen * max(w, h) * BRUSH_SPACING_MAX_MULTIPLIER) / BRUSH_SPACING_SIZES; + + if (new_size != prev_size) + { + brushes_spacing[cur_brush] = new_size; + draw_brushes_spacing(); + update_screen_rect(&r_toolopt); + + if (new_size < prev_size) + control_sound = SND_SHRINK; + else + control_sound = SND_GROW; + + playsound(screen, 0, control_sound, 0, SNDPOS_CENTER, SNDDIST_NEAR); + } } } else { - /* scroll button */ + /* Scroll buttons */ int is_upper = event.button.y < r_toolopt.y + button_h / 2; if ((is_upper && *thing_scroll > 0) /* upper arrow */ @@ -5315,6 +5379,14 @@ static void mainloop(void) gd_controls.cols = 2; } } + else if (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) + { + if (!disable_brushspacing) + { + gd_controls.rows = 1; + gd_controls.cols = 2; + } + } /* number of whole or partial rows that will be needed (can make this per-tool if variable columns needed) */ @@ -5774,6 +5846,7 @@ static void mainloop(void) { } + /* This if/if/if block is awful -bjk 2022.01.19 */ int control_rows = 0; if (cur_tool == TOOL_STAMP && !disable_stamp_controls) control_rows = 3; @@ -5794,6 +5867,9 @@ static void mainloop(void) } if (cur_tool == TOOL_SHAPES && !disable_shape_controls) control_rows = 1; + if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing) + control_rows = 1; + int num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols; if (num_things > num_places) @@ -5824,6 +5900,8 @@ static void mainloop(void) { /* One of the selectors: */ + /* FIXME: Also show "cursor_hand" when touching controls (stamp size, brush spacing, etc.!) (See below) -bjk 2022.01.19 */ + which = ((event.button.y - r_ttoolopt.h - img_scroll_up->h) / button_h) * 2 + (event.button.x - (WINDOW_WIDTH - r_ttoolopt.w)) / button_w; if (which < num_things) @@ -5836,6 +5914,8 @@ static void mainloop(void) { /* No scroll buttons - must be a selector: */ + /* FIXME: Also show "cursor_hand" when touching controls (stamp size, brush spacing, etc.!) (See above) -bjk 2022.01.19 */ + which = ((event.button.y - r_ttoolopt.h) / button_h) * 2 + (event.button.x - (WINDOW_WIDTH - r_ttoolopt.w)) / button_w; if (which < num_things) @@ -6000,7 +6080,16 @@ static void mainloop(void) eraser_draw(old_x, old_y, new_x, new_y); sz = calc_eraser_size(cur_eraser); - rect_xor(new_x - sz / 2, new_y - sz / 2, new_x + sz / 2, new_y + sz / 2); + if (cur_eraser >= NUM_ERASERS / 2) + { + /* Circle eraser */ + circle_xor(new_x, new_y, sz / 2); + } + else + { + /* Square eraser */ + rect_xor(new_x - sz / 2, new_y - sz / 2, new_x + sz / 2, new_y + sz / 2); + } } else if (cur_tool == TOOL_FILL && cur_fill == FILL_GRADIENT_LINEAR && fill_drag_started) { @@ -6055,7 +6144,6 @@ static void mainloop(void) /* Moving: Draw XOR where stamp/eraser will apply: */ - if (cur_tool == TOOL_STAMP) { w = active_stamp->w; @@ -6083,6 +6171,7 @@ static void mainloop(void) { if (cur_tool == TOOL_STAMP) { + /* Stamp */ stamp_xor(old_x, old_y); update_screen(old_x - (CUR_STAMP_W + 1) / 2 + r_canvas.x, @@ -6090,10 +6179,18 @@ static void mainloop(void) old_x + (CUR_STAMP_W + 1) / 2 + r_canvas.x, old_y + (CUR_STAMP_H + 1) / 2 + r_canvas.y); } - else { - rect_xor(old_x - w / 2, old_y - h / 2, old_x + w / 2, old_y + h / 2); + if (cur_tool == TOOL_ERASER && cur_eraser >= NUM_ERASERS / 2) + { + /* Circle eraser */ + circle_xor(old_x, old_y, calc_eraser_size(cur_eraser) / 2); + } + else + { + /* Otherwise (square eraser) */ + rect_xor(old_x - w / 2, old_y - h / 2, old_x + w / 2, old_y + h / 2); + } update_screen(old_x - w / 2 + r_canvas.x, old_y - h / 2 + r_canvas.y, @@ -6105,6 +6202,7 @@ static void mainloop(void) { if (cur_tool == TOOL_STAMP) { + /* Stamp */ stamp_xor(new_x, new_y); update_screen(old_x - (CUR_STAMP_W + 1) / 2 + r_canvas.x, @@ -6114,13 +6212,23 @@ static void mainloop(void) } else { - rect_xor(new_x - w / 2, new_y - h / 2, new_x + w / 2, new_y + h / 2); + if (cur_tool == TOOL_ERASER && cur_eraser >= NUM_ERASERS / 2) + { + /* Circle eraser */ + circle_xor(new_x, new_y, calc_eraser_size(cur_eraser) / 2); + } + else + { + /* Otherwise (square eraser) */ + rect_xor(new_x - w / 2, new_y - h / 2, new_x + w / 2, new_y + h / 2); + } update_screen(new_x - w / 2 + r_canvas.x, new_y - h / 2 + r_canvas.y, new_x + w / 2 + r_canvas.x, new_y + h / 2 + r_canvas.y); } } + if (cur_tool == TOOL_STAMP && HIT(r_toolopt) && event.motion.y > r_toolopt.h && event.motion.state == SDL_PRESSED && stamp_size_selector_clicked) { @@ -7307,6 +7415,7 @@ void show_usage(int exitcode) " [--nomagiccontrols | --magiccontrols]\n" " [--noshapecontrols | --shapecontrols]\n" " [--nolabel | --label]\n" + " [--nobrushspacing | --brushspacing]\n" " [--newcolorsfirst | --newcolorslast]\n" "\n" " Languages:\n" @@ -9363,6 +9472,11 @@ static void draw_brushes(void) /* Space for buttons, was 14 */ most = (buttons_tall * gd_toolopt.cols) - TOOLOFFSET; + if (!disable_brushspacing) + { + /* Make room for spacing controls */ + most -= 2; + } /* Do we need scrollbars? */ @@ -9462,8 +9576,57 @@ static void draw_brushes(void) } } } + + if (!disable_brushspacing) + draw_brushes_spacing(); } +static void draw_brushes_spacing(void) +{ + int i, frame_w, w, h, size_at; + float x_per, y_per; + int xx, yy; + SDL_Surface *btn, *blnk; + SDL_Rect dest; + + frame_w = img_brushes[cur_brush]->w / abs(brushes_frames[cur_brush]); + w = frame_w / (brushes_directional[cur_brush] ? 3 : 1); + h = img_brushes[cur_brush]->h / (brushes_directional[cur_brush] ? 3 : 1); + + /* Spacing ranges from 0px to "N x the max dimension of the brush" + (so a 48x48 brush would have a spacing of 48 if the center option is chosen) */ + size_at = (BRUSH_SPACING_SIZES * brushes_spacing[cur_brush]) / (max(w, h) * BRUSH_SPACING_MAX_MULTIPLIER); + + x_per = (float)r_ttoolopt.w / BRUSH_SPACING_SIZES; + y_per = (float)button_h / BRUSH_SPACING_SIZES; + + for (i = 0; i < BRUSH_SPACING_SIZES; i++) + { + xx = ceil(x_per); + yy = ceil(y_per * i); + + if (i <= size_at) + btn = thumbnail(img_btn_down, xx, yy, 0); + else + btn = thumbnail(img_btn_up, xx, yy, 0); + + blnk = thumbnail(img_btn_off, xx, button_h - yy, 0); + + /* FIXME: Check for NULL! */ + + + dest.x = (WINDOW_WIDTH - r_ttoolopt.w) + (i * x_per); + dest.y = (button_h * buttons_tall + r_ttools.h) - button_h; + SDL_BlitSurface(blnk, NULL, screen, &dest); + + dest.x = (WINDOW_WIDTH - r_ttoolopt.w) + (i * x_per); + dest.y = (button_h * buttons_tall + r_ttools.h) - (y_per * i); + SDL_BlitSurface(btn, NULL, screen, &dest); + + SDL_FreeSurface(btn); + SDL_FreeSurface(blnk); + } +} /** * FIXME @@ -11146,9 +11309,12 @@ static void line_xor(int x1, int y1, int x2, int y2) /** - * FIXME + * Draw a XOR rectangle on the canvas. + * @param x1 left edge + * @param y1 top edge + * @param x2 right edge + * @param y2 bottom edge */ -/* Draw a XOR rectangle: */ static void rect_xor(int x1, int y1, int x2, int y2) { if (x1 < 0) @@ -11182,6 +11348,33 @@ static void rect_xor(int x1, int y1, int x2, int y2) } +/** + * Draw a XOR circle on the canvas. + * @param x center x position + * @param y center y position + * @param sz size (radius) + */ +static void circle_xor(int x, int y, int sz) +{ + int xx, yy, sz2; + + /* h/t http://groups.csail.mit.edu/graphics/classes/6.837/F98/Lecture6/circle.html */ + + sz2 = sz * sz; + + xorpixel(x, y + sz); + xorpixel(x, y - sz); + + for (xx = 1; xx < sz; xx++) { + yy = sqrt(sz2 - (xx * xx) + 0.5); + xorpixel(x + xx, y + yy); + xorpixel(x + xx, y - yy); + xorpixel(x - xx, y + yy); + xorpixel(x - xx, y - yy); + } +} + + static int calc_eraser_size(int which_eraser) { #define NUM_SIZES (NUM_ERASERS / 2) @@ -11277,7 +11470,16 @@ static void do_eraser(int x, int y, int update) { update_canvas(x - sz / 2, y - sz / 2, x + sz / 2, y + sz / 2); - rect_xor(x - sz / 2, y - sz / 2, x + sz / 2, y + sz / 2); + if (cur_eraser >= NUM_ERASERS / 2) + { + /* Circle eraser */ + circle_xor(x, y, sz / 2); + } + else + { + /* Square eraser */ + rect_xor(x - sz / 2, y - sz / 2, x + sz / 2, y + sz / 2); + } #ifdef __APPLE__ /* Prevent ghosted eraser outlines from remaining on the screen in windowed mode */ @@ -24481,6 +24683,7 @@ static void setup_config(char *argv[]) SETBOOL(all_locale_fonts); SETBOOL(autosave_on_quit); SETBOOL(disable_label); + SETBOOL(disable_brushspacing); SETBOOL(disable_magic_controls); SETBOOL(disable_shape_controls); SETBOOL(disable_print);