Fill crash solved and some translations Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2021-05-09 18:02:11 +02:00
commit 4d27837af0
8 changed files with 99 additions and 84 deletions

View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$
2021.April.19 (0.9.26)
2021.May.9 (0.9.26)
* New Features
------------
* Larger UI buttons
@ -92,9 +92,15 @@ $Id$
* Albanian
Besnik Bleta <besnik@programeshqip.org>
* Galician translation
* Catalan
Pere Pujal i Carabantes <pere@fornol.no-ip.org>
* Galician
Miguel Bouzada <mbouzada@gmail.com>
* Icelandic
Sveinn í Felli <sv1@fellsnet.is>
* Magic Tool Improvememnts:
-------------------------
* A new "xorpixel()" function has been added to the Magic Tools API.

View file

@ -131,10 +131,11 @@ Usuarios de Windows
24 e 192, inclusive. A maioría dos botóns son cadrados e isto
afectará ao seu largo e alto.
Note: If the chosen button size would cause the buttons to be
too large for all required UI elements to appear under Tux
Paint's chosen window size, the largest possible button size
will be used. (A note will appear in stderr.)
Nota: Se o tamaño do botón escollido fai que os botóns sexan
demasiado grandes para que aparezan todos os elementos da
interface de usuario requiridos dentro do tamaño de xanela
escollido por Tux Paint, empregarase o tamaño de botón máis
grande posíbel. (Aparecerá unha nota en stderr.)
allowscreensaver=yes

View file

@ -199,7 +199,7 @@
O valor <i>TAMAÑO</i> debería presentarse en píxeles e pode estar entre 24 e 192, inclusive. A maioría dos botóns son cadrados e isto afectará ao seu largo e alto. </p>
<p>
Note: If the chosen button size would cause the buttons to be too large for all required UI elements to appear under Tux Paint's chosen window size, the largest possible button size will be used. (A note will appear in <code>stderr</code>.) </p>
Nota: Se o tamaño do botón escollido fai que os botóns sexan demasiado grandes para que aparezan todos os elementos da interface de usuario requiridos dentro do tamaño de xanela escollido por Tux Paint, empregarase o tamaño de botón máis grande posíbel. (Aparecerá unha nota en <code>stderr</code>.) </p>
</dd>
<dt>

View file

@ -4,7 +4,7 @@
Fill tool
Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2019 by Bill Kendrick and others; see AUTHORS.txt
Copyright (c) 2002-2021 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com
http://www.tuxpaint.org/
@ -27,7 +27,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
Last updated: March 8, 2021
Last updated: May 5, 2021
$Id$
*/
@ -137,6 +137,7 @@ void simulate_flood_fill_outside_check(SDL_Surface * screen, SDL_Texture * textu
double in_line, closeness;
static unsigned char prog_anim;
Uint32 px_colr;
Uint8 touch_byt;
/* "Same" color? No need to fill */
@ -187,7 +188,11 @@ void simulate_flood_fill_outside_check(SDL_Surface * screen, SDL_Texture * textu
}
if (touched != NULL) {
touched[(y * canvas->w) + fillL] = (255 - ((Uint8) (in_line * 85)));
touch_byt = (255 - ((Uint8) (in_line * 85)));
if (touch_byt == 0)
touch_byt = 1;
touched[(y * canvas->w) + fillL] = touch_byt;
}
px_colr = getpixels[last->format->BytesPerPixel] (last, fillL, y);
@ -210,7 +215,11 @@ void simulate_flood_fill_outside_check(SDL_Surface * screen, SDL_Texture * textu
{
if (touched != NULL)
{
touched[(y * canvas->w) + fillL] = (255 - ((Uint8) (in_line * 85)));
touch_byt = (255 - ((Uint8) (in_line * 85)));
if (touch_byt == 0)
touch_byt = 1;
touched[(y * canvas->w) + fillL] = touch_byt;
}
px_colr = getpixels[last->format->BytesPerPixel] (last, fillL, y);
@ -240,7 +249,11 @@ void simulate_flood_fill_outside_check(SDL_Surface * screen, SDL_Texture * textu
}
if (touched != NULL) {
touched[(y * canvas->w) + fillR] = (255 - ((Uint8) (in_line * 85)));
touch_byt = (255 - ((Uint8) (in_line * 85)));
if (touch_byt == 0)
touch_byt = 1;
touched[(y * canvas->w) + fillR] = touch_byt;
}
px_colr = getpixels[last->format->BytesPerPixel] (last, fillR, y);
@ -263,7 +276,11 @@ void simulate_flood_fill_outside_check(SDL_Surface * screen, SDL_Texture * textu
{
if (touched != NULL)
{
touched[(y * canvas->w) + fillR] = (255 - ((Uint8) (in_line * 85)));
touch_byt = (255 - ((Uint8) (in_line * 85)));
if (touch_byt == 0)
touch_byt = 1;
touched[(y * canvas->w) + fillR] = touch_byt;
}
px_colr = getpixels[last->format->BytesPerPixel] (last, fillR, y);

View file

@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: Tuxpaint cvs 2009-06-21\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-20 20:40-0800\n"
"PO-Revision-Date: 2020-08-17 22:43+0200\n"
"PO-Revision-Date: 2021-05-08 01:11+0200\n"
"Last-Translator: Pere Pujal i Carabantes <perepujal@gmail.com>\n"
"Language-Team: Català <linux-ca@chanae.alphanet.ch>\n"
"Language: ca\n"
@ -222,35 +222,31 @@ msgstr "EÉÈËCÇ"
#: ../fill_tools.h:49
msgid "Solid"
msgstr ""
msgstr "Sòlid"
#: ../fill_tools.h:50
#, fuzzy
#| msgid "Lines"
msgid "Linear"
msgstr "Línies"
msgstr "Lineal"
#: ../fill_tools.h:51
msgid "Radial"
msgstr ""
msgstr "Radial"
#: ../fill_tools.h:55
#, fuzzy
#| msgid "Click in the picture to fill that area with color."
msgid "Click to fill an area with a solid color."
msgstr "Feu clic en la imatge per omplir de color una àrea."
msgstr "Feu clic per omplir una àrea amb un color sòlid."
#: ../fill_tools.h:56
msgid ""
"Click and drag to fill an area with a linear gradient (from the chosen color "
"to transparent)."
msgstr ""
msgstr "Feu clic i arrossegueu per omplir una àrea amb un gradient lineal (del color triat fins el transparent)."
#: ../fill_tools.h:57
msgid ""
"Click to fill an area with a radial gradient (from the chosen color to "
"transparent)."
msgstr ""
msgstr "Feu clic per omplir una àrea amb un gradient radial (del color triat fins el transparent)."
#. Congratulations #1
#: ../great.h:37
@ -455,12 +451,11 @@ msgstr "Lletres"
msgid "Magic"
msgstr "Màgic"
# Modes d'emplenar, "Emplena" ja apareix en el botó de l'eina i no cal repetir-ho aquí.
#. Title of fill selector (buttons down the right for fill tool)
#: ../titles.h:81
#, fuzzy
#| msgid "Fill"
msgid "Fills"
msgstr "Emplena"
msgstr "Modes"
#. Freehand painting tool
#: ../tools.h:62
@ -974,23 +969,21 @@ msgstr ""
#: ../../magic/src/checkerboard.c:99
msgid "Checkerboard"
msgstr ""
msgstr "Escacs"
#: ../../magic/src/checkerboard.c:106
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. "
msgid "Click and drag to fill the canvas with a checkerboard pattern."
msgstr "Feu clic i arrossegueu per dibuixar una sanefa."
msgstr "Feu clic i arrossegueu per dibuixar un tauler d'escacs."
#: ../../magic/src/clone.c:132
msgid "Clone"
msgstr ""
msgstr "Clona"
#: ../../magic/src/clone.c:138
msgid ""
"Click once to pick a spot to begin cloning. Click again and drag to clone "
"that part of the picture."
msgstr ""
msgstr "Feu clic per triar el punt d'inici per clonar. Torneu a fer clic i arrossegueu per clonar aquella part del dibuix."
#: ../../magic/src/confetti.c:83
msgid "Confetti"
@ -1313,13 +1306,11 @@ msgstr ""
#. Both are named "Pixels", at the moment:
#: ../../magic/src/pixels.c:108
msgid "Pixels"
msgstr ""
msgstr "Píxels"
#: ../../magic/src/pixels.c:114
#, fuzzy
#| msgid "Click and drag to draw large bricks."
msgid "Click and drag to draw large pixels."
msgstr "Feu clic i arrossegueu per dibuixar rajoles grans."
msgstr "Feu clic i arrossegueu per dibuixar píxels grans."
#: ../../magic/src/puzzle.c:103
msgid "Puzzle"

View file

@ -1,16 +1,16 @@
# Tux Paint Translation to Icelandic.
# Íslensk þýðing á TuxPaint
# Copyright (C) 2002-2017.
# This file is distributed under the same license as the tuxpaint package.
#
# Pjetur G. Hjaltason <pjetur@pjetur.net>, 2002, 2003, 2004, 2014.
# Sveinn í Felli <sv1@fellsnet.is>, 2015, 2017, 2020.
# Tux Paint Translation to Icelandic.
# Íslensk þýðing á TuxPaint
# Copyright (C) 2002-2017.
# This file is distributed under the same license as the tuxpaint package.
#
# Pjetur G. Hjaltason <pjetur@pjetur.net>, 2002, 2003, 2004, 2014.
# Sveinn í Felli <sv1@fellsnet.is>, 2015, 2017, 2020, 2021.
msgid ""
msgstr ""
"Project-Id-Version: tuxpaint\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-20 20:40-0800\n"
"PO-Revision-Date: 2020-12-10 14:59+0000\n"
"PO-Revision-Date: 2021-05-02 13:23+0000\n"
"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
"Language: is\n"
@ -185,35 +185,37 @@ msgstr "ÐÉÍÓÚÞÆÖ"
#: ../fill_tools.h:49
msgid "Solid"
msgstr ""
msgstr "Einlitt"
#: ../fill_tools.h:50
#, fuzzy
#| msgid "Lines"
msgid "Linear"
msgstr "Línur"
msgstr "Línulegt"
#: ../fill_tools.h:51
msgid "Radial"
msgstr ""
msgstr "Frá miðju"
#: ../fill_tools.h:55
#, fuzzy
#| msgid "Click in the picture to fill that area with color."
msgid "Click to fill an area with a solid color."
msgstr "Smelltu og hreyfðu músina til að fylla svæðið með lit."
msgstr "Smelltu til að fylla svæðið með lit."
#: ../fill_tools.h:56
msgid ""
"Click and drag to fill an area with a linear gradient (from the chosen color "
"to transparent)."
msgstr ""
"Smelltu og dragðu músina til að fylla svæði með línulegum litstigli (deyfist"
" úr völdum lit yfir í gegnsætt)."
#: ../fill_tools.h:57
msgid ""
"Click to fill an area with a radial gradient (from the chosen color to "
"transparent)."
msgstr ""
"Smelltu til að fylla svæði með hringlaga litstigli (deyfist úr völdum lit"
" yfir í gegnsætt)."
#. Congratulations #1
#: ../great.h:37
@ -390,7 +392,7 @@ msgstr "Litir"
msgid "Brushes"
msgstr "Penslar"
# Strokleður is the same in plural as singular
# Strokleður is the same in plural as singular
#. Title of eraser selector (buttons down the right for eraser tool)
#: ../titles.h:66
msgid "Erasers"
@ -420,10 +422,9 @@ msgstr "Galdrar"
#. Title of fill selector (buttons down the right for fill tool)
#: ../titles.h:81
#, fuzzy
#| msgid "Fill"
msgid "Fills"
msgstr "Fylla"
msgstr "Fyllingar"
#. Freehand painting tool
#: ../tools.h:62
@ -932,23 +933,24 @@ msgstr "Smelltu og dragðu músina til að breyta myndinni í teiknimynd."
#: ../../magic/src/checkerboard.c:99
msgid "Checkerboard"
msgstr ""
msgstr "Köflótt"
#: ../../magic/src/checkerboard.c:106
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. "
msgid "Click and drag to fill the canvas with a checkerboard pattern."
msgstr "Smelltu og dragðu músina til að búa til endurtekin mynstur. "
msgstr "Smelltu og dragðu músina til að búa til köflótta reiti."
#: ../../magic/src/clone.c:132
msgid "Clone"
msgstr ""
msgstr "Klóna"
#: ../../magic/src/clone.c:138
msgid ""
"Click once to pick a spot to begin cloning. Click again and drag to clone "
"that part of the picture."
msgstr ""
"Smelltu einu sinni til að velja brett til að klóna. Smelltu og dragðu músina"
" til að búa til afrit af þeim bletti."
#: ../../magic/src/confetti.c:83
msgid "Confetti"
@ -1266,13 +1268,12 @@ msgstr ""
#. Both are named "Pixels", at the moment:
#: ../../magic/src/pixels.c:108
msgid "Pixels"
msgstr ""
msgstr "Mynddílar"
#: ../../magic/src/pixels.c:114
#, fuzzy
#| msgid "Click and drag to draw large bricks."
msgid "Click and drag to draw large pixels."
msgstr "Smelltu og dragðu músina til að búa til stóra múrsteina."
msgstr "Smelltu og dragðu músina til að búa til stóra mynddíla."
#: ../../magic/src/puzzle.c:103
msgid "Puzzle"

View file

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: tuxpaint 0.9.23\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-20 20:40-0800\n"
"PO-Revision-Date: 2020-08-19 20:56+0900\n"
"PO-Revision-Date: 2021-05-04 13:29+0900\n"
"Last-Translator: Shin-ichi TOYAMA <shin1@wmail.plala.or.jp>\n"
"Language-Team: japanese <shin1@wmail.plala.or.jp>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.1\n"
"X-Generator: Poedit 2.4.3\n"
#. Response to Black (0, 0, 0) color selected
#: ../colors.h:86
@ -182,35 +182,35 @@ msgstr "<9>spare-9b"
#: ../fill_tools.h:49
msgid "Solid"
msgstr ""
msgstr "なし"
#: ../fill_tools.h:50
#, fuzzy
#| msgid "Lines"
msgid "Linear"
msgstr "せん"
msgstr "リニア"
#: ../fill_tools.h:51
msgid "Radial"
msgstr ""
msgstr "ほうしゃ"
#: ../fill_tools.h:55
#, fuzzy
#| msgid "Click in the picture to fill that area with color."
msgid "Click to fill an area with a solid color."
msgstr "いろで ぬりつぶしたいところを クリックしてね。"
msgstr "クリックしたところを ひとつのいろで ぬりつぶします。"
#: ../fill_tools.h:56
msgid ""
"Click and drag to fill an area with a linear gradient (from the chosen color "
"to transparent)."
msgstr ""
"クリックしてからドラッグすると ひとつのむきにグラデーションをつけて ぬりつぶ"
"します。"
#: ../fill_tools.h:57
msgid ""
"Click to fill an area with a radial gradient (from the chosen color to "
"transparent)."
msgstr ""
"クリックしてからドラッグすると まわりにむかってグラデーションをつけて ぬりつ"
"ぶします。"
#. Congratulations #1
#: ../great.h:37
@ -420,10 +420,8 @@ msgstr "まほう"
#. Title of fill selector (buttons down the right for fill tool)
#: ../titles.h:81
#, fuzzy
#| msgid "Fill"
msgid "Fills"
msgstr "ぬる"
msgstr "グラデーション"
#. Freehand painting tool
#: ../tools.h:62
@ -945,24 +943,26 @@ msgstr "クリックしたままマウスをうごかして まんがみたい
#: ../../magic/src/checkerboard.c:99
msgid "Checkerboard"
msgstr ""
msgstr "チェッカーボード"
# msgid "Click and drag to draw train track rails on your picture."
#: ../../magic/src/checkerboard.c:106
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. "
msgid "Click and drag to fill the canvas with a checkerboard pattern."
msgstr "クリックしたまま マウスをうごかして くりかえしもようを かこう。 "
msgstr ""
"クリックしてからドラッグすると えのぜんたいに チェッカーボードのパターンを え"
"がきます。"
#: ../../magic/src/clone.c:132
msgid "Clone"
msgstr ""
msgstr "クローン"
#: ../../magic/src/clone.c:138
msgid ""
"Click once to pick a spot to begin cloning. Click again and drag to clone "
"that part of the picture."
msgstr ""
"えを ほかのばしょに うつしとります。まず うつしとりたい もとのところを クリッ"
"クしてから うつしたいさきのところで ドラッグします。"
#: ../../magic/src/confetti.c:83
msgid "Confetti"
@ -1282,13 +1282,11 @@ msgstr ""
#. Both are named "Pixels", at the moment:
#: ../../magic/src/pixels.c:108
msgid "Pixels"
msgstr ""
msgstr "ピクセル"
#: ../../magic/src/pixels.c:114
#, fuzzy
#| msgid "Click and drag to draw large bricks."
msgid "Click and drag to draw large pixels."
msgstr "おおきな レンガを かこう。"
msgstr "おおきなドットのふでで せんを かこう。"
#: ../../magic/src/puzzle.c:103
msgid "Puzzle"

View file

@ -4381,6 +4381,7 @@ static void mainloop(void)
else if (cur_tool == TOOL_FILL)
{
cur_fill = cur_thing;
draw_tux_text(TUX_GREAT, fill_tips[cur_fill], 1);
if (do_draw)
draw_fills();
@ -4885,7 +4886,7 @@ static void mainloop(void)
update_canvas(x1, y1, x2, y2);
}
draw_tux_text(TUX_GREAT, tool_tips[TOOL_FILL], 1);
draw_tux_text(TUX_GREAT, fill_tips[cur_fill], 1);
}
}
else if (cur_tool == TOOL_TEXT || cur_tool == TOOL_LABEL)