Merge branch 'master' into sdl2.0

Makefile

@@ -4,7 +4,7 @@
 # Various contributors (see AUTHORS.txt)
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - September 14, 2019
+# June 14, 2002 - September 25, 2019
 
 
 # The version number, for release:
@@ -709,9 +709,9 @@ $(THUMB_STARTERS):
 	@mkdir -p starters/.thumbs
 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
 	then \
-		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp.png ; \
+		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
-		convert $(CONVERT_OPTS) obj/tmp.png $@ ; \
+		convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \
-		rm obj/tmp.png ; \
+		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
 	else \
 		convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \
 	fi

docs/CHANGES.txt

@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2019.Sep.21 (0.9.24)
+2019.Sep.25 (0.9.24)
   * New tools
     ---------
     * Fill
@@ -23,28 +23,6 @@ $Id$
     * Updates to build on Haiku.
       Luc 'Begasus' Schrijvers <begasus@gmail.com>
 
-  * Bug Fixes
-    ---------
-    * Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7.
-      (See https://sourceforge.net/p/tuxpaint/tuxpaint/ci/d2ef2e17d1962111d0f6f91394dce81e8706d48b/
-      and https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7)
-      Mark K. Kim <mkkim214@gmail.com>
-
-    * Reduce launch time by calling progress bar less frequently
-      while loading stamps.
-      Mark K. Kim <mkkim214@gmail.com>
-
-    * Ability to bring up the print dialog from the macOS build was
-      removed in Tux Paint 0.9.23 to support the new build mechanism.
-      It has been re-added.  To access it, option-click the print icon,
-      or configure Tux Paint to always bring up the dialog upon print.
-      Mark K. Kim <mkkim214@gmail.com>
-
-    * Made sure "New" dialog created correct thumbnail subdirectories
-      for personal Starters & Templates (e.g., ~/.tuxpaint/starters/thumbs/)
-
-    * Moved the setting of the window icon after window creation.
-
   * Other Improvements
     ------------------
     * Added ability to move color palette options to the end of
@@ -86,7 +64,36 @@ $Id$
       the new "SIGUSR1" & "SIGUSR2") added to a new doc file,
       "SIGNALS.txt".
 
-  * Misc
+  * Bug Fixes
+    ---------
+    * Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7.
+      (See https://sourceforge.net/p/tuxpaint/tuxpaint/ci/d2ef2e17d1962111d0f6f91394dce81e8706d48b/
+      and https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7)
+      Mark K. Kim <mkkim214@gmail.com>
+
+    * Reduce launch time by calling progress bar less frequently
+      while loading stamps.
+      Mark K. Kim <mkkim214@gmail.com>
+
+    * Ability to bring up the print dialog from the macOS build was
+      removed in Tux Paint 0.9.23 to support the new build mechanism.
+      It has been re-added.  To access it, option-click the print icon,
+      or configure Tux Paint to always bring up the dialog upon print.
+      Mark K. Kim <mkkim214@gmail.com>
+
+    * Made sure "New" dialog created correct thumbnail subdirectories
+      for personal Starters & Templates (e.g., ~/.tuxpaint/starters/thumbs/)
+
+    * Ensure that similarly-named (but not identically-named) PNG & SVG
+      Starters & Templates don't get confused with each other
+      (e.g., "frame_heart.png" being ignored, because we find
+      "frame_hearts.svg")
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+
+    * Moved the setting of the window icon after window creation.
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+
+* Misc
     ----
     * Verbose debugging, and "DEBUG_PRINTF()" macro now available;
       see debugging options in INSTALL.txt.

src/manpage/tuxpaint.1

@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2019.09.21
+.\" tuxpaint.1 - 2019.09.25
-.TH TUXPAINT 1 "21 September 2019" "0.9.24" "Tux Paint"
+.TH TUXPAINT 1 "25 September 2019" "0.9.24" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -9,7 +9,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 
 .TP 9
 .B tuxpaint
-[\-\-fullscreen]
+[\-\-fullscreen {yes|native|no}]
 .br
 [\-\-allowscreensaver]
 .br
@@ -260,8 +260,11 @@ Show the license (GNU GPL) under which Tux Paint is released.
 They can be used along with, instead of, or to override options set in
 configuration files. (See below.)
 .TP 8
-.B \-\-fullscreen \-\-windowed
+.B \-\-fullscreen=yes \-\-fullscreen=native \-\-fullscreen=no \-\-windowed
-Run \fITux Paint\fP in full-screen mode, or in a window (default).
+Run \fITux Paint\fP in full-screen mode at its default -- or a specified
+-- screen resolution ("--fullscreen=yes"); or in full-screen mode at the
+system's native resolution ("--fullscreen=native"); or run in a window
+("--fullscreen=no" or "--windowed") (default).
 
 .TP 8
 .B \-\-allowscreensaver \-\-disablescreensaver
@@ -1171,9 +1174,8 @@ Pablo Pita,
 Milan Plzik,
 Sergei Popov,
 John Popplewell,
-Rodrigo Perez Ramirez and Indigenas Sin Fronteras,
 Adam 'foo-script' Rakowski,
-Rodrigo Perez Ramirez,
+Rodrigo Perez Ramirez and Indigenas Sin Fronteras,
 Robert Readman,
 Leandro Regueiro,
 Simona Riva,

src/tuxpaint.c

@@ -19329,7 +19329,7 @@ static int do_new_dialog(void)
                           f2 = &(fs[k].f);
                           strcpy(fname2, f2->d_name);
 
-                          if (strstr(fname, fname2) == fname2 && strcasestr(fname2, ".svg") != NULL)
+                          if (strstr(fname2, fname) == fname2 && strlen(fname) == strlen(fname2)- strlen(".svg") && strcasestr(fname2, ".svg") != NULL)
                             {
                               /* SVG of this bitmap exists; we'll skip it */
                               skip = 1;