From 65378f6fdd48a8a04ea2bf78dca0db472a8450c5 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Mon, 29 May 2023 10:50:55 -0700 Subject: [PATCH] Ability to disable Template creation from Open dialog --- docs/CHANGES.txt | 3 --- docs/en/OPTIONS.txt | 15 ++++++++++++++- docs/en/README.txt | 11 ++++++++--- docs/en/html/OPTIONS.html | 17 +++++++++++++++-- docs/en/html/README.html | 11 +++++++---- docs/es_ES.UTF-8/OPTIONS.txt | 15 ++++++++++++++- docs/es_ES.UTF-8/README.txt | 11 ++++++++--- docs/es_ES.UTF-8/html/OPTIONS.html | 17 +++++++++++++++-- docs/es_ES.UTF-8/html/README.html | 11 +++++++---- docs/fr_FR.UTF-8/OPTIONS.txt | 15 ++++++++++++++- docs/fr_FR.UTF-8/README.txt | 11 ++++++++--- docs/fr_FR.UTF-8/html/OPTIONS.html | 17 +++++++++++++++-- docs/fr_FR.UTF-8/html/README.html | 11 +++++++---- docs/gl_ES.UTF-8/OPTIONS.txt | 15 ++++++++++++++- docs/gl_ES.UTF-8/README.txt | 11 ++++++++--- docs/gl_ES.UTF-8/html/OPTIONS.html | 17 +++++++++++++++-- docs/gl_ES.UTF-8/html/README.html | 11 +++++++---- docs/ja_JP.UTF-8/OPTIONS.txt | 18 ++++++++++++++++-- docs/ja_JP.UTF-8/README.txt | 14 ++++++++++---- docs/ja_JP.UTF-8/html/OPTIONS.html | 17 +++++++++++++++-- docs/ja_JP.UTF-8/html/README.html | 11 +++++++---- man/en/tuxpaint.1 | 13 +++++++++++-- man/es_ES.UTF-8/tuxpaint.1 | 13 +++++++++++-- man/fr_FR.UTF-8/tuxpaint.1 | 13 +++++++++++-- man/gl_ES.UTF-8/tuxpaint.1 | 13 +++++++++++-- man/ja_JP.UTF-8/tuxpaint.1 | 13 +++++++++++-- src/parse.gperf | 1 + src/parse.h | 1 + src/tuxpaint-completion.bash | 3 ++- src/tuxpaint.c | 14 ++++++++------ 30 files changed, 291 insertions(+), 72 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 0d82d7267..b7dafa7a8 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -49,10 +49,7 @@ https://tuxpaint.org/ Closes https://sourceforge.net/p/tuxpaint/feature-requests/236/ Bill Kendrick + TODO - Need to allow the ability to turn this feature off. - - tuxpaint: Command-line/config file option - - tuxpaint: Add to bash completion - tuxpaint-docs,tuxpaint: Document in OPTIONS docs - - tuxpaint-docs,tuxpaint: Document in manpage - tuxpaint-config: Add support to Tux Paint Config. * Bug Fixes: diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt index 14871e229..d2e618b01 100644 --- a/docs/en/OPTIONS.txt +++ b/docs/en/OPTIONS.txt @@ -6,7 +6,7 @@ Options Documentation Copyright © 2002-2023 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - May 18, 2023 + May 29, 2023 +---------------------------------------------+ |Table of Contents | @@ -482,6 +482,19 @@ Simplification "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing". + notemplateexport=yes + + Disables the ability to create a new Template image (based on a + saved drawing) from within the Open dialog. + + 📜 Note: The Template creation feature was added to Tux Paint in + version 0.9.31. + + ⚙ Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "notemplateexport=no" or "templateexport=yes". In both cases, may + be overridden by the command-line option "--templateexport". + Languages Language diff --git a/docs/en/README.txt b/docs/en/README.txt index 3d104f2fc..d02ca635a 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - May 18, 2023 + May 29, 2023 +----------------------------------------------------+ |Table of Contents | @@ -404,7 +404,8 @@ Available Tools 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. + Brush spacing may be adjusted. See the brush spacing section of + the "Paint" tool, above, to learn more. "Shapes" Tool @@ -766,7 +767,11 @@ Available Tools be used as the basis for new drawings. 📜 Note: The Template creation feature was added to Tux Paint - in version 0.9.30. + in version 0.9.31. + + ⚙ The Template creation feature can be disabled (e.g., by + selecting "Disable 'Make Template'" in Tux Paint Config. or + running Tux Paint with the "notemplateexport" option). * Click the red 'Back' arrow button at the lower right of the list to cancel and return to the picture you were drawing. diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index fdbc2110b..6fcbcc64b 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -102,7 +102,7 @@

- May 18, 2023

+ May 29, 2023

@@ -704,12 +704,25 @@

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

+ 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".

+ +
+ notemplateexport=yes +
+ +
+

+ Disables the ability to create a new Template image (based on a saved drawing) from within the Open dialog.

+

+ 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

+

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

+
diff --git a/docs/en/html/README.html b/docs/en/html/README.html index 170e996d0..e3dc5ce86 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -102,7 +102,7 @@

- May 18, 2023

+ May 29, 2023

- Brush Spacing + 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.

@@ -699,7 +699,7 @@ 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.

+ 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 the brush spacing section of the "Paint" tool, above, to learn more.

- 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.30.

+ 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

+ +

+ ⚙ The Template creation feature can be disabled (e.g., by selecting "Disable 'Make Template'" in Tux Paint Config. or running Tux Paint with the "notemplateexport" option).

  • diff --git a/docs/es_ES.UTF-8/OPTIONS.txt b/docs/es_ES.UTF-8/OPTIONS.txt index 18b1bf3b8..79c7fc37a 100644 --- a/docs/es_ES.UTF-8/OPTIONS.txt +++ b/docs/es_ES.UTF-8/OPTIONS.txt @@ -6,7 +6,7 @@ Options Documentation Copyright © 2002-2023 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - mayo 18, 2023 + mayo 29, 2023 +---------------------------------------------+ |Table of Contents | @@ -482,6 +482,19 @@ Simplification "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing". + notemplateexport=yes + + Disables the ability to create a new Template image (based on a + saved drawing) from within the Open dialog. + + 📜 Note: The Template creation feature was added to Tux Paint in + version 0.9.31. + + ⚙ Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "notemplateexport=no" or "templateexport=yes". In both cases, may + be overridden by the command-line option "--templateexport". + Languages Language diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt index 63e3d2996..ab93b8541 100644 --- a/docs/es_ES.UTF-8/README.txt +++ b/docs/es_ES.UTF-8/README.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - mayo 18, 2023 + mayo 29, 2023 +----------------------------------------------------+ |Table of Contents | @@ -404,7 +404,8 @@ Available Tools 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. + Brush spacing may be adjusted. See the brush spacing section of + the "Paint" tool, above, to learn more. "Shapes" Tool @@ -766,7 +767,11 @@ Available Tools be used as the basis for new drawings. 📜 Note: The Template creation feature was added to Tux Paint - in version 0.9.30. + in version 0.9.31. + + ⚙ The Template creation feature can be disabled (e.g., by + selecting "Disable 'Make Template'" in Tux Paint Config. or + running Tux Paint with the "notemplateexport" option). * Click the red 'Back' arrow button at the lower right of the list to cancel and return to the picture you were drawing. diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html index f84f98309..fe4dfaf48 100644 --- a/docs/es_ES.UTF-8/html/OPTIONS.html +++ b/docs/es_ES.UTF-8/html/OPTIONS.html @@ -102,7 +102,7 @@

    - mayo 18, 2023

    + mayo 29, 2023

    @@ -704,12 +704,25 @@

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

    + 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".

    + +
    + notemplateexport=yes +
    + +
    +

    + Disables the ability to create a new Template image (based on a saved drawing) from within the Open dialog.

    +

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    +

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

    +
    diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html index 28f0802ed..bc136d9af 100644 --- a/docs/es_ES.UTF-8/html/README.html +++ b/docs/es_ES.UTF-8/html/README.html @@ -102,7 +102,7 @@

    - mayo 18, 2023

    + mayo 29, 2023

    • - Brush Spacing + 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.

    @@ -699,7 +699,7 @@ 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.

    + 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 the brush spacing section of the "Paint" tool, above, to learn more.

    - 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.30.

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    + +

    + ⚙ The Template creation feature can be disabled (e.g., by selecting "Disable 'Make Template'" in Tux Paint Config. or running Tux Paint with the "notemplateexport" option).

  • diff --git a/docs/fr_FR.UTF-8/OPTIONS.txt b/docs/fr_FR.UTF-8/OPTIONS.txt index 7f264bc84..4f8a763de 100644 --- a/docs/fr_FR.UTF-8/OPTIONS.txt +++ b/docs/fr_FR.UTF-8/OPTIONS.txt @@ -6,7 +6,7 @@ Documentation sur les options Copyright © 2002-2023 by divers contributeurs; see AUTHORS.txt. https://tuxpaint.org/ - mai 18, 2023 + mai 29, 2023 +---------------------------------------------------------------------+ |Table des matières | @@ -502,6 +502,19 @@ Simplification "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing". + notemplateexport=yes + + Disables the ability to create a new Template image (based on a + saved drawing) from within the Open dialog. + + 📜 Note: The Template creation feature was added to Tux Paint in + version 0.9.31. + + ⚙ Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "notemplateexport=no" or "templateexport=yes". In both cases, may + be overridden by the command-line option "--templateexport". + Langues Langue diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt index 6a1f54b1e..7b166a608 100644 --- a/docs/fr_FR.UTF-8/README.txt +++ b/docs/fr_FR.UTF-8/README.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by divers contributeurs; see AUTHORS.txt. https://tuxpaint.org/ - mai 18, 2023 + mai 29, 2023 +----------------------------------------------------------+ |Table des matières | @@ -418,7 +418,8 @@ Outils disponibles 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. + Brush spacing may be adjusted. See the brush spacing section of + the "Paint" tool, above, to learn more. Outil "Formes" @@ -801,7 +802,11 @@ Outils disponibles be used as the basis for new drawings. 📜 Note: The Template creation feature was added to Tux Paint - in version 0.9.30. + in version 0.9.31. + + ⚙ The Template creation feature can be disabled (e.g., by + selecting "Disable 'Make Template'" in Tux Paint Config. or + running Tux Paint with the "notemplateexport" option). * Ou cliquez sur le bouton fléché rouge «Retour» en bas à droite de la liste pour annuler et revenir à l'image que vous diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html index d88c91e00..5636c56a6 100644 --- a/docs/fr_FR.UTF-8/html/OPTIONS.html +++ b/docs/fr_FR.UTF-8/html/OPTIONS.html @@ -102,7 +102,7 @@

    - mai 18, 2023

    + mai 29, 2023

    @@ -704,12 +704,25 @@

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

    + 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".

    + +
    + notemplateexport=yes +
    + +
    +

    + Disables the ability to create a new Template image (based on a saved drawing) from within the Open dialog.

    +

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    +

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

    +
    diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html index 1cced82a7..af9f3ea97 100644 --- a/docs/fr_FR.UTF-8/html/README.html +++ b/docs/fr_FR.UTF-8/html/README.html @@ -102,7 +102,7 @@

    - mai 18, 2023

    + mai 29, 2023

    • - Espacement des pinceaux + 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.

    @@ -699,7 +699,7 @@ 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.

    + 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 the brush spacing section of the "Paint" tool, above, to learn more.

    - 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.30.

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    + +

    + ⚙ The Template creation feature can be disabled (e.g., by selecting "Disable 'Make Template'" in Tux Paint Config. or running Tux Paint with the "notemplateexport" option).

  • diff --git a/docs/gl_ES.UTF-8/OPTIONS.txt b/docs/gl_ES.UTF-8/OPTIONS.txt index 49b7a2d8e..43bc86f7f 100644 --- a/docs/gl_ES.UTF-8/OPTIONS.txt +++ b/docs/gl_ES.UTF-8/OPTIONS.txt @@ -6,7 +6,7 @@ Documentación de opcións Copyright © 2002-2023 by varios colaboradores; see AUTHORS.txt. https://tuxpaint.org/ - 18 de Maio de 2023 + 29 de Maio de 2023 +----------------------------------------------------+ |Índice | @@ -495,6 +495,19 @@ Simplificación "nobrushspacing=no" or "brushspacing=yes". In both cases, may be overridden by the command-line option "--brushspacing". + notemplateexport=yes + + Disables the ability to create a new Template image (based on a + saved drawing) from within the Open dialog. + + 📜 Note: The Template creation feature was added to Tux Paint in + version 0.9.31. + + ⚙ Note: If used in a system-wide configuration file, may be + overridden by the user's configuration file using + "notemplateexport=no" or "templateexport=yes". In both cases, may + be overridden by the command-line option "--templateexport". + Languages Language diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt index 01fb8923b..e5a44581f 100644 --- a/docs/gl_ES.UTF-8/README.txt +++ b/docs/gl_ES.UTF-8/README.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by varios colaboradores; see AUTHORS.txt. https://tuxpaint.org/ - 18 de Maio de 2023 + 29 de Maio de 2023 +-----------------------------------------------------------+ |Índice | @@ -409,7 +409,8 @@ Ferramentas dispoñíbeis 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. + Brush spacing may be adjusted. See the brush spacing section of + the "Paint" tool, above, to learn more. Ferramenta «Formas» @@ -779,7 +780,11 @@ Ferramentas dispoñíbeis be used as the basis for new drawings. 📜 Note: The Template creation feature was added to Tux Paint - in version 0.9.30. + in version 0.9.31. + + ⚙ The Template creation feature can be disabled (e.g., by + selecting "Disable 'Make Template'" in Tux Paint Config. or + running Tux Paint with the "notemplateexport" option). * Prema no botón de frecha vermello «Atrás» situado na parte inferior dereita da lista para cancelar e volver á imaxe que diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html index b68a6347f..5ffd9890d 100644 --- a/docs/gl_ES.UTF-8/html/OPTIONS.html +++ b/docs/gl_ES.UTF-8/html/OPTIONS.html @@ -102,7 +102,7 @@

    - 18 de Maio de 2023

    + 29 de Maio de 2023

    @@ -704,12 +704,25 @@

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

    + 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".

    + +
    + notemplateexport=yes +
    + +
    +

    + Disables the ability to create a new Template image (based on a saved drawing) from within the Open dialog.

    +

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    +

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

    +
    diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html index 6b64db094..48fa2e046 100644 --- a/docs/gl_ES.UTF-8/html/README.html +++ b/docs/gl_ES.UTF-8/html/README.html @@ -102,7 +102,7 @@

    - 18 de Maio de 2023

    + 29 de Maio de 2023

    • - Espazado do pincel + 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.

    @@ -699,7 +699,7 @@ 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.

    + 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 the brush spacing section of the "Paint" tool, above, to learn more.

    - 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.30.

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    + +

    + ⚙ The Template creation feature can be disabled (e.g., by selecting "Disable 'Make Template'" in Tux Paint Config. or running Tux Paint with the "notemplateexport" option).

  • diff --git a/docs/ja_JP.UTF-8/OPTIONS.txt b/docs/ja_JP.UTF-8/OPTIONS.txt index 383066813..b3555857c 100644 --- a/docs/ja_JP.UTF-8/OPTIONS.txt +++ b/docs/ja_JP.UTF-8/OPTIONS.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by various contributors; AUTHORS.txt 参照. https://tuxpaint.org/ - 2023年5月18日 + 2023年5月29日 +---------------------------------+ |目次 | @@ -378,7 +378,8 @@ Windows のユーザー nobrushspacing=yes - 「ふで」ツールと「せん」ツールで、描画間隔の調整を無効にします。標準の描画間隔が用いられます。 + Disables the brush spacing option of the Paint and Lines tools. + The brushes' default spacings will be used. 📜 注: 描画間隔調整のオプションは、バージョン 0.9.28 で追加されました。描画間隔調整についての詳細は、EXTENDING.htmlを参照してください。 @@ -387,6 +388,19 @@ Windows のユーザー "brushspacing=yes" を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--brushspacing" で変更できます。 + notemplateexport=yes + + Disables the ability to create a new Template image (based on a + saved drawing) from within the Open dialog. + + 📜 Note: The Template creation feature was added to Tux Paint in + version 0.9.31. + + ⚙ 注: システム全体の設定ファイルで設定されている場合は、ユーザーの設定ファイルで "notemplateexport=no" + または "templateexport=yes" + を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--templateexport" + で変更できます。 + 言語関連 言語 diff --git a/docs/ja_JP.UTF-8/README.txt b/docs/ja_JP.UTF-8/README.txt index afb0b3798..c139f1985 100644 --- a/docs/ja_JP.UTF-8/README.txt +++ b/docs/ja_JP.UTF-8/README.txt @@ -6,7 +6,7 @@ Copyright © 2002-2023 by various contributors; AUTHORS.txt 参照. https://tuxpaint.org/ - 2023年5月18日 + 2023年5月29日 +-------------------------------------+ |目次 | @@ -277,8 +277,10 @@ 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 the brush spacing section of + the "Paint" tool, above, to learn more. 「かたち」ツール @@ -508,7 +510,11 @@ Tux Paint の起動 be used as the basis for new drawings. 📜 Note: The Template creation feature was added to Tux Paint - in version 0.9.30. + in version 0.9.31. + + ⚙ The Template creation feature can be disabled (e.g., by + selecting "Disable 'Make Template'" in Tux Paint Config. or + running Tux Paint with the "notemplateexport" option). * 右下にある赤色の「もどる」ボタンを押すと、絵を描く画面に戻ります。 diff --git a/docs/ja_JP.UTF-8/html/OPTIONS.html b/docs/ja_JP.UTF-8/html/OPTIONS.html index e860d46ad..f77600bc7 100644 --- a/docs/ja_JP.UTF-8/html/OPTIONS.html +++ b/docs/ja_JP.UTF-8/html/OPTIONS.html @@ -102,7 +102,7 @@

    - 2023年5月18日

    + 2023年5月29日

    @@ -704,12 +704,25 @@

    - 「ふで」ツールと「せん」ツールで、描画間隔の調整を無効にします。標準の描画間隔が用いられます。

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

    📜 注: 描画間隔調整のオプションは、バージョン 0.9.28 で追加されました。描画間隔調整についての詳細は、EXTENDING.htmlを参照してください。

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

    + +
    + notemplateexport=yes +
    + +
    +

    + Disables the ability to create a new Template image (based on a saved drawing) from within the Open dialog.

    +

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    +

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

    +
    diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html index 7bc253e3d..098f7196c 100644 --- a/docs/ja_JP.UTF-8/html/README.html +++ b/docs/ja_JP.UTF-8/html/README.html @@ -102,7 +102,7 @@

    - 2023年5月18日

    + 2023年5月29日

    • - ブラシの描画間隔 + ブラシの描画間隔

    「ふで」でキャンバスに描画する際の間隔を変更できます。標準で、いくつかのブラシ (足跡や花など) は重ならないように十分な間隔を空けてあります。他のブラシ (基本的な円形のものなど) は狭い間隔で連続した線になるように設定されています。

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

    - 線に沿って形が並んだり、連続した線になったりと、それぞれの「ふで」毎に異なる描画間隔が設定されており、この間隔は変更することができます。詳しくは、上の "ペイントブラシ「ふで」" のセクションを参照して下さい。

    + 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 the brush spacing section of the "Paint" tool, above, to learn more.

    - 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.30.

    + 📜 Note: The Template creation feature was added to Tux Paint in version 0.9.31.

    + +

    + ⚙ The Template creation feature can be disabled (e.g., by selecting "Disable 'Make Template'" in Tux Paint Config. or running Tux Paint with the "notemplateexport" option).

  • diff --git a/man/en/tuxpaint.1 b/man/en/tuxpaint.1 index d07915f22..86c560a0e 100644 --- a/man/en/tuxpaint.1 +++ b/man/en/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2023.05.20 -.TH TUXPAINT 1 "May 20, 2023" "0.9.31" "Tux Paint" +.\" tuxpaint.1 - 2023.05.29 +.TH TUXPAINT 1 "May 29, 2023" "0.9.31" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -77,6 +77,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nobrushspacing] .br +[\-\-notemplateexport] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -227,6 +229,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-brushspacing] .br +[\-\-templateexport] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -451,6 +455,11 @@ which can be altered or moved later. 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. +.TP 8 +.B \-\-notemplateexport \-\-templateexport +Disable or enable (default) the ability to create new Templates from saved +drawings via the Open dialog. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux diff --git a/man/es_ES.UTF-8/tuxpaint.1 b/man/es_ES.UTF-8/tuxpaint.1 index 9c34c225b..d9b115566 100644 --- a/man/es_ES.UTF-8/tuxpaint.1 +++ b/man/es_ES.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2023.05.20 -.TH TUXPAINT 1 "mayo 20, 2023" "0.9.31" "Tux Paint" +.\" tuxpaint.1 - 2023.05.29 +.TH TUXPAINT 1 "mayo 29, 2023" "0.9.31" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -77,6 +77,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nobrushspacing] .br +[\-\-notemplateexport] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -227,6 +229,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-brushspacing] .br +[\-\-templateexport] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -451,6 +455,11 @@ which can be altered or moved later. 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. +.TP 8 +.B \-\-notemplateexport \-\-templateexport +Disable or enable (default) the ability to create new Templates from saved +drawings via the Open dialog. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux diff --git a/man/fr_FR.UTF-8/tuxpaint.1 b/man/fr_FR.UTF-8/tuxpaint.1 index 897aa75f0..9a17aacda 100644 --- a/man/fr_FR.UTF-8/tuxpaint.1 +++ b/man/fr_FR.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2023.05.20 -.TH TUXPAINT 1 "mai 20, 2023" "0.9.31" "Tux Paint" +.\" tuxpaint.1 - 2023.05.29 +.TH TUXPAINT 1 "mai 29, 2023" "0.9.31" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. @@ -77,6 +77,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. .br [\-\-nobrushspacing] .br +[\-\-notemplateexport] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -227,6 +229,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants. .br [\-\-brushspacing] .br +[\-\-templateexport] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -461,6 +465,11 @@ texte qui peut être modifié ou déplacé plus tard. 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. +.TP 8 +.B \-\-notemplateexport \-\-templateexport +Disable or enable (default) the ability to create new Templates from saved +drawings via the Open dialog. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepte les options suivantes pour modifier la manière dont diff --git a/man/gl_ES.UTF-8/tuxpaint.1 b/man/gl_ES.UTF-8/tuxpaint.1 index 870dd6413..0b5497b8e 100644 --- a/man/gl_ES.UTF-8/tuxpaint.1 +++ b/man/gl_ES.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2023.05.20 -.TH TUXPAINT 1 "20 de Maio de 2023" "0.9.31" "Tux Paint" +.\" tuxpaint.1 - 2023.05.29 +.TH TUXPAINT 1 "29 de Maio de 2023" "0.9.31" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -77,6 +77,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nobrushspacing] .br +[\-\-notemplateexport] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -227,6 +229,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-brushspacing] .br +[\-\-templateexport] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -451,6 +455,11 @@ which can be altered or moved later. 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. +.TP 8 +.B \-\-notemplateexport \-\-templateexport +Disable or enable (default) the ability to create new Templates from saved +drawings via the Open dialog. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux diff --git a/man/ja_JP.UTF-8/tuxpaint.1 b/man/ja_JP.UTF-8/tuxpaint.1 index d14c9ba1d..d19427dea 100644 --- a/man/ja_JP.UTF-8/tuxpaint.1 +++ b/man/ja_JP.UTF-8/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2023.05.20 -.TH TUXPAINT 1 "2023年5月20日" "0.9.31" "Tux Paint" +.\" tuxpaint.1 - 2023.05.29 +.TH TUXPAINT 1 "2023年5月29日" "0.9.31" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -77,6 +77,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nobrushspacing] .br +[\-\-notemplateexport] +.br [\-\-newcolorslast] .br [\-\-mirrorstamps] @@ -227,6 +229,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-brushspacing] .br +[\-\-templateexport] +.br [\-\-newcolorsfirst] .br [\-\-dontmirrorstamps] @@ -451,6 +455,11 @@ which can be altered or moved later. 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. +.TP 8 +.B \-\-notemplateexport \-\-templateexport +Disable or enable (default) the ability to create new Templates from saved +drawings via the Open dialog. + .SH OPTIONS - CONTROLLING TUX PAINT .l \fItuxpaint\fP accepts the following options to alter how you control Tux diff --git a/src/parse.gperf b/src/parse.gperf index 84043a55e..809897da8 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -156,6 +156,7 @@ stampcontrols, NEGBOOL(disable_stamp_controls) stamps, NEGBOOL(dont_load_stamps) stampsize, MULTI(stamp_size_override) stamprotation, NEGBOOL(no_stamp_rotation) +templateexport, NEGBOOL(disable_template_export) startblank, POSBOOL(start_blank) startlast, NEGBOOL(start_blank) sysconfig, POSBOOL(parsertmp_sysconfig) diff --git a/src/parse.h b/src/parse.h index 19486e9db..a555b494f 100644 --- a/src/parse.h +++ b/src/parse.h @@ -23,6 +23,7 @@ struct cfginfo const char *disable_save; const char *disable_screensaver; const char *disable_stamp_controls; + const char *disable_template_export; const char *dont_do_xor; const char *dont_load_stamps; const char *no_stamp_rotation; diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash index f674e962c..ad3ccc05f 100644 --- a/src/tuxpaint-completion.bash +++ b/src/tuxpaint-completion.bash @@ -3,7 +3,7 @@ # Bill Kendrick ; https://tuxpaint.org/ # Based on inkscape's completion file, by allali@univ-mlv.fr # -# Last modified 2023-04-12 +# Last modified 2023-05-29 # # $Id$ @@ -59,6 +59,7 @@ _tuxpaint() --nomagiccontrols --magiccontrols \ --nomagicsizes --magicsizes \ --noshapecontrols --shapecontrols \ + --notemplateexport --templateexport \ --mirrorstamps --dontmirrorstamps \ --stampsize=0 --stampsize=1 \ --stampsize=2 --stampsize=3 \ diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 98340b859..a06cde61d 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - May 27, 2023 + June 14, 2002 - May 29, 2023 */ #include "platform.h" @@ -1416,6 +1416,8 @@ static int stamp_size_override = -1; static int no_stamp_rotation = 0; static int new_colors_last; +static int disable_template_export; + static Uint8 magic_disabled_features = 0x00000000; #ifdef NOKIA_770 @@ -17006,8 +17008,7 @@ static int do_open(void) char *instructions; int num_left_buttons; - /* FIXME: Support simplification to disable "Template" (make a template) option -bjk 2023.05.25 */ - if (1) { + if (!disable_template_export) { instructions = textdir(gettext_noop("Choose a picture and then click “Open”, “Export”, “Template“, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.")); } else { instructions = textdir(gettext_noop("Choose a picture and then click “Open”, “Export”, or “Erase”. Click “Slides” to create a slideshow animation or “Back“ to return to your current picture.")); @@ -17125,8 +17126,7 @@ static int do_open(void) SDL_BlitSurface(img_openlabels_slideshow, NULL, screen, &dest); - /* FIXME: Support simplification to disable "Template" option -bjk 2023.05.25 */ - if (1) { + if (!disable_template_export) { /* "Template" (make template) button: */ num_left_buttons = 3; @@ -17427,7 +17427,8 @@ static int do_open(void) done = 1; playsound(screen, 1, SND_CLICK, 1, SNDPOS_LEFT, SNDDIST_NEAR); } - else if (event.button.x >= r_ttools.w + button_w * 2 + else if (!disable_template_export && + event.button.x >= r_ttools.w + button_w * 2 && event.button.x < r_ttools.w + button_w * 3 && event.button.y >= (button_h * buttons_tall + r_ttools.h) - button_h @@ -27897,6 +27898,7 @@ static void setup_config(char *argv[]) SETBOOL(disable_save); SETBOOL(disable_screensaver); SETBOOL(disable_stamp_controls); + SETBOOL(disable_template_export); SETBOOL(dont_do_xor); SETBOOL(dont_load_stamps); SETBOOL(fullscreen);