notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

0.9.24 Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2020-03-29 16:35:50 +02:00
commit 937b40e449
14 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/CHANGES.txt
View file

@ -2,13 +2,13 @@ CHANGES.txt for Tux Paint
Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2019
Copyright (c) 2002-2020
Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/
$Id$
2019.Sep.25 (0.9.24)
2020.Mar.25 (0.9.24)
* New tools
---------
* Fill
@ -36,6 +36,9 @@ $Id$
Use "--newcolorslast" option.
(Suggested by Bernard Verhaeghe)
* Show progress bar while loading (more) stamps, to avoid
looking hung on slower systems or with complicated stamp images.
* Recognize signals (SIGUSR1 and SIGUSR2) on POSIX systems,
which causes Tux Paint to quit, first saving the current drawing
(if unsaved) (like "--autosave"), either saving a new image

2
docs/en/ADVANCED-STAMPS-HOWTO.txt
View file

@ -1,5 +1,5 @@
Tux Paint
version 0.9.23c
version 0.9.24
Advanced Stamps HOWTO
Copyright 2006-2008 by Albert Cahalan for the Tux Paint project

6
docs/en/EXTENDING.txt
View file

@ -1,11 +1,11 @@
Tux Paint
version 0.9.23c
version 0.9.24
Extending Tux Paint
Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - October 7, 2018
June 14, 2002 - March 28, 2020
----------------------------------------------------------------------

6
docs/en/FAQ.txt
View file

@ -1,11 +1,11 @@
Tux Paint
version 0.9.23c
version 0.9.24
Frequently Asked Questions
Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
September 14, 2002 - October 7, 2018
September 14, 2002 - March 28, 2020
Drawing-related

4
docs/en/OPTIONS.txt
View file

@ -3,10 +3,10 @@
Options Documentation
Copyright (c) 2002-2019 by various contributors; see AUTHORS.txt
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
September 21, 2019
March 28, 2020
----------------------------------------------------------------------

4
docs/en/README.txt
View file

@ -3,10 +3,10 @@
A simple drawing program for children
Copyright 2002-2019 by various contributors; see AUTHORS.txt
Copyright 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - September 21, 2019
June 14, 2002 - March 28, 2020
----------------------------------------------------------------------

2
docs/en/html/ADVANCED-STAMPS-HOWTO.html
View file

@ -11,7 +11,7 @@ alink="#FF00FF">
alt="Tux&nbsp;Paint"><br>
version
0.9.23c
0.9.24
<br>
Advanced Stamps HOWTO</h1>

6
docs/en/html/EXTENDING.html
View file

@ -12,15 +12,15 @@ alt="Tux&nbsp;Paint"><br>
version
0.9.23c
0.9.24
<br>
Extending Tux Paint</h1>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<p>Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 - October 7, 2018</p>
<p>June 14, 2002 - March 28, 2020</p>
</center>
<hr size=2 noshade>

6
docs/en/html/FAQ.html
View file

@ -11,15 +11,15 @@ alink="#FF00FF">
alt="Tux&nbsp;Paint"><br>
version
0.9.23c
0.9.24
<br>
Frequently Asked Questions</h1>
<p>Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt<br/>
<p>Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>September 14, 2002 - October 7, 2018</p>
<p>September 14, 2002 - March 28, 2020</p>
</center>
<h2>Drawing-related</h2>

4
docs/en/html/OPTIONS.html
View file

@ -16,10 +16,10 @@ version
</h1>
<h2>Options Documentation</h2>
<p>Copyright (c) 2002-2019 by various contributors; see AUTHORS.txt<br/>
<p>Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt<br/>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>September 21, 2019</p>
<p>March 28, 2020</p>
</center>

4
docs/en/html/README.html
View file

@ -17,12 +17,12 @@ version
</h1>
<h3>A simple drawing program for children</h3>
<p>Copyright 2002-2019 by various contributors; see AUTHORS.txt<br>
<p>Copyright 2002-2020 by various contributors; see AUTHORS.txt<br>
<a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 -
September 21, 2019</p>
March 28, 2020</p>
</center>

6
macos/Info.plist
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>tuxpaint</string>
<key>CFBundleGetInfoString</key>
<string>0.9.23c, Copyright 2009-2018, Tux Paint Development Team</string>
<string>0.9.24, Copyright 2009-2020, Tux Paint Development Team</string>
<key>CFBundleIconFile</key>
<string>tuxpaint.icns</string>
<key>CFBundleIdentifier</key>
@ -19,10 +19,10 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.9.23c</string>
<string>0.9.24</string>
<key>CFBundleSignature</key>
<string>TXPT</string>
<key>CFBundleVersion</key>
<string>2018-10-07</string>
<string>2020-03-28</string>
</dict>
</plist>

4
src/manpage/tuxpaint.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2019.09.25
.TH TUXPAINT 1 "25 September 2019" "0.9.24" "Tux Paint"
.\" tuxpaint.1 - 2020.03.28
.TH TUXPAINT 1 "28 March 2020" "0.9.24" "Tux Paint"
.SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children.

10
src/tuxpaint.c
View file

@ -3,7 +3,7 @@
Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2019
Copyright (c) 2002-2020
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 - October 5, 2019
June 14, 2002 - March 15, 2020
*/
@ -9154,7 +9154,7 @@ static void draw_stamps(void)
for (stamp = stamp_scroll[stamp_group]; stamp < stamp_scroll[stamp_group] + max; stamp++)
{
i = stamp - stamp_scroll[stamp_group];
show_progress_bar(screen);
dest.x = ((i % 2) * 48) + (WINDOW_WIDTH - 96);
dest.y = ((i / 2) * 48) + 40 + off_y;
@ -9374,6 +9374,8 @@ static void draw_stamps(void)
}
#endif
}
redraw_tux_text();
}
@ -24434,7 +24436,7 @@ static void setup(void)
printf("%s\n", tmp_str);
#endif
snprintf(tmp_str, sizeof(tmp_str), "© 2002–2019 Bill Kendrick et al.");
snprintf(tmp_str, sizeof(tmp_str), "© 2002–2020 Bill Kendrick et al.");
tmp_surf = render_text(medium_font, tmp_str, black);
dest.x = 10;
dest.y = WINDOW_HEIGHT - img_progress->h - (tmp_surf->h * 2);