diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index d138abf7b..9bf12a978 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -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
diff --git a/docs/en/ADVANCED-STAMPS-HOWTO.txt b/docs/en/ADVANCED-STAMPS-HOWTO.txt
index b5d2e214c..12b246435 100644
--- a/docs/en/ADVANCED-STAMPS-HOWTO.txt
+++ b/docs/en/ADVANCED-STAMPS-HOWTO.txt
@@ -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
diff --git a/docs/en/EXTENDING.txt b/docs/en/EXTENDING.txt
index dee5cabe1..31ead65f0 100644
--- a/docs/en/EXTENDING.txt
+++ b/docs/en/EXTENDING.txt
@@ -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
----------------------------------------------------------------------
diff --git a/docs/en/FAQ.txt b/docs/en/FAQ.txt
index a0e825557..2afac793e 100644
--- a/docs/en/FAQ.txt
+++ b/docs/en/FAQ.txt
@@ -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
diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt
index 0797db276..9472404ad 100644
--- a/docs/en/OPTIONS.txt
+++ b/docs/en/OPTIONS.txt
@@ -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
----------------------------------------------------------------------
diff --git a/docs/en/README.txt b/docs/en/README.txt
index 325889a26..92b43d5c8 100644
--- a/docs/en/README.txt
+++ b/docs/en/README.txt
@@ -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
----------------------------------------------------------------------
diff --git a/docs/en/html/ADVANCED-STAMPS-HOWTO.html b/docs/en/html/ADVANCED-STAMPS-HOWTO.html
index 8caa9cd17..2f8dbeac8 100644
--- a/docs/en/html/ADVANCED-STAMPS-HOWTO.html
+++ b/docs/en/html/ADVANCED-STAMPS-HOWTO.html
@@ -11,7 +11,7 @@ alink="#FF00FF">
alt="Tux Paint">
version
-0.9.23c
+0.9.24
Advanced Stamps HOWTO
diff --git a/docs/en/html/EXTENDING.html b/docs/en/html/EXTENDING.html
index 3e661142a..5fe31ea5a 100644
--- a/docs/en/html/EXTENDING.html
+++ b/docs/en/html/EXTENDING.html
@@ -12,15 +12,15 @@ alt="Tux Paint">
version
-0.9.23c
+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
diff --git a/docs/en/html/FAQ.html b/docs/en/html/FAQ.html
index f9df6ef88..afadcaa54 100644
--- a/docs/en/html/FAQ.html
+++ b/docs/en/html/FAQ.html
@@ -11,15 +11,15 @@ alink="#FF00FF">
alt="Tux Paint">
version
-0.9.23c
+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
diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html
index 9791070da..ef282e7b8 100644
--- a/docs/en/html/OPTIONS.html
+++ b/docs/en/html/OPTIONS.html
@@ -16,10 +16,10 @@ version
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
diff --git a/docs/en/html/README.html b/docs/en/html/README.html
index 63796688d..d13f39d86 100644
--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@@ -17,12 +17,12 @@ version
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
+ March 28, 2020
diff --git a/macos/Info.plist b/macos/Info.plist
index 9deb9ab58..4bc4c2b16 100644
--- a/macos/Info.plist
+++ b/macos/Info.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
tuxpaint
CFBundleGetInfoString
- 0.9.23c, Copyright 2009-2018, Tux Paint Development Team
+ 0.9.24, Copyright 2009-2020, Tux Paint Development Team
CFBundleIconFile
tuxpaint.icns
CFBundleIdentifier
@@ -19,10 +19,10 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.9.23c
+ 0.9.24
CFBundleSignature
TXPT
CFBundleVersion
- 2018-10-07
+ 2020-03-28
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index f25a1da04..6a25a976b 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -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.
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 9c4e261ab..fe3cc9e9c 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -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);