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

Show progress bar while loading (more) stamps

Browse source
This commit is contained in:
Bill Kendrick 2020-03-15 13:06:13 -07:00
parent 2860da7668
commit ad4bfde57c
4 changed files with 15 additions and 10 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. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2019 Copyright (c) 2002-2020
Various contributors (see below, and AUTHORS.txt) Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
$Id$ $Id$
2019.Sep.25 (0.9.24) 2020.Mar.25 (0.9.24)
* New tools * New tools
--------- ---------
* Fill * Fill
@ -36,6 +36,9 @@ $Id$
Use "--newcolorslast" option. Use "--newcolorslast" option.
(Suggested by Bernard Verhaeghe) (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, * Recognize signals (SIGUSR1 and SIGUSR2) on POSIX systems,
which causes Tux Paint to quit, first saving the current drawing which causes Tux Paint to quit, first saving the current drawing
(if unsaved) (like "--autosave"), either saving a new image (if unsaved) (like "--autosave"), either saving a new image

4
docs/en/README.txt
View file

@ -3,10 +3,10 @@
A simple drawing program for children 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/ http://www.tuxpaint.org/
June 14, 2002 - September 21, 2019 June 14, 2002 - March 15, 2019
---------------------------------------------------------------------- ----------------------------------------------------------------------

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

@ -17,12 +17,12 @@ version
</h1> </h1>
<h3>A simple drawing program for children</h3> <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> <a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
<p>June 14, 2002 - <p>June 14, 2002 -
September 21, 2019</p> March 15, 2019</p>
</center> </center>

10
src/tuxpaint.c
View file

@ -3,7 +3,7 @@
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2019 Copyright (c) 2002-2020
by various contributors; see AUTHORS.txt by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/ http://www.tuxpaint.org/
@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - October 5, 2019 June 14, 2002 - March 15, 2020
*/ */
@ -8850,7 +8850,7 @@ static void draw_stamps(void)
for (stamp = stamp_scroll[stamp_group]; stamp < stamp_scroll[stamp_group] + max; stamp++) for (stamp = stamp_scroll[stamp_group]; stamp < stamp_scroll[stamp_group] + max; stamp++)
{ {
i = stamp - stamp_scroll[stamp_group]; i = stamp - stamp_scroll[stamp_group];
show_progress_bar(screen);
dest.x = ((i % 2) * 48) + (WINDOW_WIDTH - 96); dest.x = ((i % 2) * 48) + (WINDOW_WIDTH - 96);
dest.y = ((i / 2) * 48) + 40 + off_y; dest.y = ((i / 2) * 48) + 40 + off_y;
@ -9069,6 +9069,8 @@ static void draw_stamps(void)
} }
#endif #endif
} }
redraw_tux_text();
} }
@ -23766,7 +23768,7 @@ static void setup(void)
printf("%s\n", tmp_str); printf("%s\n", tmp_str);
#endif #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); tmp_surf = render_text(medium_font, tmp_str, black);
dest.x = 10; dest.x = 10;
dest.y = WINDOW_HEIGHT - img_progress->h - (tmp_surf->h * 2); dest.y = WINDOW_HEIGHT - img_progress->h - (tmp_surf->h * 2);