- February 21, 2022
+ February 23, 2022+
On the far right are three special color options:
Note: You can also press [Control / ⌘] + [N] on the keyboard to start a new drawing.
++ 'Starter' & Template Images+ Along with the preset solid colors, you can also choose colors using a rainbow palette or a "color mixer". These operate identically to the options found in the color palette shown below the canvas when drawing a picture. See Main Screen > Lower: Colors > Special color options for details.
+
diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt index 7a8541cc8..d14d291b5 100644 --- a/docs/es_ES.UTF-8/README.txt +++ b/docs/es_ES.UTF-8/README.txt @@ -7,7 +7,7 @@ https://tuxpaint.org/ @TuxPaintTweets on Twitter - febrero 21, 2022 + febrero 23, 2022 ---------------------------------------------------------------------- @@ -616,6 +616,15 @@ Available Tools Note: You can also press [Control / ⌘] + [N] on the keyboard to start a new drawing. + Special Solid Background Color Choices + + Along with the preset solid colors, you can also choose + colors using a rainbow palette or a "color mixer". These + operate identically to the options found in the color + palette shown below the canvas when drawing a picture. See + Main Screen > Lower: Colors > Special color options for + details. + 'Starter' & Template Images 'Starters' can behave like a page from a coloring book — a diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html index 38ee85755..e1d59ca93 100644 --- a/docs/es_ES.UTF-8/html/README.html +++ b/docs/es_ES.UTF-8/html/README.html @@ -29,7 +29,7 @@
- febrero 21, 2022
+ febrero 23, 2022
-+
On the far right are three special color options:
- The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.
- The rainbow palette allows you to pick a color from within a box containing thousands of colors.
- The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors — red, yellow, and blue — along with white (to "tint"), grey (to "tone"), and black (to "shade"). The ratios of colors added are shown at the bottom.
@@ -867,6 +867,13 @@Note: You can also press
+ + Special Solid Background Color Choices +[Control / ⌘]+[N]on the keyboard to start a new drawing.++ 'Starter' & Template Images+ Along with the preset solid colors, you can also choose colors using a rainbow palette or a "color mixer". These operate identically to the options found in the color palette shown below the canvas when drawing a picture. See Main Screen > Lower: Colors > Special color options for details.
+diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt index 0005956e3..8657fd244 100644 --- a/docs/fr_FR.UTF-8/README.txt +++ b/docs/fr_FR.UTF-8/README.txt @@ -7,7 +7,7 @@ https://tuxpaint.org/ @TuxPaintTweets on Twitter - février 21, 2022 + février 23, 2022 ---------------------------------------------------------------------- @@ -656,6 +656,15 @@ Outils disponibles Remarque : vous pouvez également appuyer [Control / ⌘] + [N] sur le clavier pour commencer un nouveau dessin. + Special Solid Background Color Choices + + Along with the preset solid colors, you can also choose + colors using a rainbow palette or a "color mixer". These + operate identically to the options found in the color + palette shown below the canvas when drawing a picture. See + Main Screen > Lower: Colors > Special color options for + details. + Images de "Démarrage" et images "Modèle" Les "Images de démarrage" se comportent comme une page diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html index 888493c55..ad0323639 100644 --- a/docs/fr_FR.UTF-8/html/README.html +++ b/docs/fr_FR.UTF-8/html/README.html @@ -29,7 +29,7 @@
- février 21, 2022
+ février 23, 2022
-+
On the far right are three special color options:
- The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.
- The rainbow palette allows you to pick a color from within a box containing thousands of colors.
- The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors — red, yellow, and blue — along with white (to "tint"), grey (to "tone"), and black (to "shade"). The ratios of colors added are shown at the bottom.
@@ -867,6 +867,13 @@Remarque : vous pouvez également appuyer
+ + Special Solid Background Color Choices +[Control / ⌘]+[N]sur le clavier pour commencer un nouveau dessin.++ Images de "Démarrage" et images "Modèle"+ Along with the preset solid colors, you can also choose colors using a rainbow palette or a "color mixer". These operate identically to the options found in the color palette shown below the canvas when drawing a picture. See Main Screen > Lower: Colors > Special color options for details.
+diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt index 861825922..b31b858d7 100644 --- a/docs/gl_ES.UTF-8/README.txt +++ b/docs/gl_ES.UTF-8/README.txt @@ -7,7 +7,7 @@ https://tuxpaint.org/ @TuxPaintTweets on Twitter - 21 de Febreiro de 2022 + 23 de Febreiro de 2022 ---------------------------------------------------------------------- @@ -630,6 +630,15 @@ Ferramentas dispoñíbeis Nota: Tamén pode premer [Control / ⌘] + [N] no teclado para iniciar un novo debuxo. + Special Solid Background Color Choices + + Along with the preset solid colors, you can also choose + colors using a rainbow palette or a "color mixer". These + operate identically to the options found in the color + palette shown below the canvas when drawing a picture. See + Main Screen > Lower: Colors > Special color options for + details. + Imaxes «de comezo» e de «modelo» As «imaxes de inicio» poden comportarse como unha páxina diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html index 9082f6aac..4ee704e8a 100644 --- a/docs/gl_ES.UTF-8/html/README.html +++ b/docs/gl_ES.UTF-8/html/README.html @@ -29,7 +29,7 @@
- 21 de Febreiro de 2022
+ 23 de Febreiro de 2022
-+
On the far right are three special color options:
- The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.
- The rainbow palette allows you to pick a color from within a box containing thousands of colors.
- The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors — red, yellow, and blue — along with white (to "tint"), grey (to "tone"), and black (to "shade"). The ratios of colors added are shown at the bottom.
@@ -867,6 +867,13 @@Nota: Tamén pode premer
+ + Special Solid Background Color Choices +[Control / ⌘]+[N]no teclado para iniciar un novo debuxo.++ Imaxes «de comezo» e de «modelo»+ Along with the preset solid colors, you can also choose colors using a rainbow palette or a "color mixer". These operate identically to the options found in the color palette shown below the canvas when drawing a picture. See Main Screen > Lower: Colors > Special color options for details.
+diff --git a/docs/ja_JP.UTF-8/README.txt b/docs/ja_JP.UTF-8/README.txt index 8bcb448f4..a8bbb5982 100644 --- a/docs/ja_JP.UTF-8/README.txt +++ b/docs/ja_JP.UTF-8/README.txt @@ -7,7 +7,7 @@ https://tuxpaint.org/ @TuxPaintTweets on Twitter - 2022年2月21日 + 2022年2月23日 ---------------------------------------------------------------------- @@ -449,6 +449,15 @@ Tux Paint の起動 注: キーボードで [Control / ⌘] + [N] を押しても新規作成ができます。 + Special Solid Background Color Choices + + Along with the preset solid colors, you can also choose + colors using a rainbow palette or a "color mixer". These + operate identically to the options found in the color + palette shown below the canvas when drawing a picture. See + Main Screen > Lower: Colors > Special color options for + details. + レイヤー画像 レイヤー画像には、塗り絵のページのようなもの（白黒の線で描かれ、色を塗ることができる）や、前景レイヤーと背景レイヤーに挟まれた部分に絵を描ける３Ｄ画像のようなものがあります。 diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html index 83ba9e948..55ae05ad9 100644 --- a/docs/ja_JP.UTF-8/html/README.html +++ b/docs/ja_JP.UTF-8/html/README.html @@ -29,7 +29,7 @@
- 2022年2月21日
+ 2022年2月23日
-+
On the far right are three special color options:
- The "color picker" (which has an outline of an eye-dropper) allows you to pick a color found within your drawing. A shortcut key is available to access this feature quickly; see below.
- The rainbow palette allows you to pick a color from within a box containing thousands of colors.
- The "color mixer" (which has silhouette of a paint palette) allows you to create colors by blending primary additive colors — red, yellow, and blue — along with white (to "tint"), grey (to "tone"), and black (to "shade"). The ratios of colors added are shown at the bottom.
@@ -867,6 +867,13 @@注: キーボードで
+ + Special Solid Background Color Choices +[Control / ⌘]+[N]を押しても新規作成ができます。++ レイヤー画像+ Along with the preset solid colors, you can also choose colors using a rainbow palette or a "color mixer". These operate identically to the options found in the color palette shown below the canvas when drawing a picture. See Main Screen > Lower: Colors > Special color options for details.
+diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 211d4c254..0276a307f 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 - February 22, 2022 + June 14, 2002 - February 23, 2022 */ #include "platform.h" @@ -681,9 +681,10 @@ static int NUM_COLORS; static Uint8 **color_hexes; static char **color_names; -#define COLOR_MIXER (NUM_COLORS - 1) /* Mix colors together */ +/* Special color options (from left-to-right (very last entry)) */ #define COLOR_SELECTOR (NUM_COLORS - 3) /* Pick a color from the canvas */ #define COLOR_PICKER (NUM_COLORS - 2) /* Pick a color from a palette */ +#define COLOR_MIXER (NUM_COLORS - 1) /* Mix colors together */ /* Show debugging stuff: */ @@ -21292,6 +21293,11 @@ static int do_new_dialog(void) if (do_color_picker() == 0) return (0); } + else if (which == COLOR_MIXER) + { + if (do_color_mix() == 0) + return (0); + } /* FIXME: Don't do anything and go back to Open dialog if they hit BACK in color picker! */ @@ -21410,13 +21416,20 @@ static int do_new_dialog_add_colors(SDL_Surface * *thumbs, int num_files, int *d *white_in_palette = j; } } - else + else if (j == COLOR_PICKER) { /* Color picker: */ thumbs[num_files] = thumbnail(img_color_picker, THUMB_W - 20, THUMB_H - 20, 0); added = 1; } + else if (j == COLOR_MIXER) + { + /* Color mixer: */ + + thumbs[num_files] = thumbnail(img_color_mix, THUMB_W - 20, THUMB_H - 20, 0); + added = 1; + } if (added) {