Icons for most of the new Magic Tools that were lacking them.

docs/AUTHORS.txt

@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
 http://www.tuxpaint.org/
 
 
-June 17, 2002 - April 23, 2009
+June 17, 2002 - May 6, 2009
 
 $Id$
 
@@ -51,7 +51,7 @@ $Id$
     Thomas Kalka <thomas.kalka@googlemail.com>
 
   Blur ('entire image' mode), Sharpen, Trace Contour, Silhouette,
-  Snow Flake, Snow Ball, Black & White, Threshold, Alien, Toothpaste,
+  Snow Flake, Snow Ball, Color & White, Threshold, Alien, Toothpaste,
   Tint ('Brush' mode), Noise, Rain and Mosaic Magic Tools.
   Jigsaw 3x3 and Jigsaw 5x5 starter images.
   by Andrew 'akanewbie' Corcoran <akanewbie@gmail.com>
@@ -75,7 +75,11 @@ $Id$
   * UI buttons - Created using "AquaPro" button script in The GIMP
     Copyright (C) 2001 Denis Bodor <b.bodor@calixo.net>
 
-  * UI icons - Created by Bill Kendrick using The GIMP
+  * Many UI icons - Created by Bill Kendrick using The GIMP
+
+  * Magic tool icons
+    + Individual Magic tool authors
+    + Donelle Cory <thegirlbassist@gmail.com>
 
   * Cartoon representation of "Tux," the Linux penguin
     Created by Sam "Criswell" Hart  <criswell@geekcomix.com>

docs/CHANGES.txt

@@ -63,6 +63,10 @@ $Id$
       String 'V' - Draw free-form string-like patterns.
       By Pere Pujal i Carabantes <pere@fornol.no-ip.org>
 
+    * Icons for some new Magic Tools
+      (Color and White, Fisheye, Mosaic, Picasso, Silhouette, TV and Wavelet)
+      Donelle Cory <thegirlbassist@gmail.com>
+
   * Magic Tool Improvememnts:
     --------------------------
     * Added "_switchin()" and "_switchout()" functions to Magic tool API,

magic/src/mosaic.c

@@ -7,7 +7,7 @@
 
   Credits: Andrew Corcoran <akanewbie@gmail.com>
 
-  Copyright (c) 2002-2007 by Bill Kendrick and others; see AUTHORS.txt
+  Copyright (c) 2002-2009 by Bill Kendrick and others; see AUTHORS.txt
   bill@newbreedsoftware.com
   http://www.tuxpaint.org/
 
@@ -26,7 +26,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  Last updated: June 6, 2008
+  Last updated: May 6, 2009
   $Id$
 */
 
@@ -61,10 +61,10 @@ enum {
 static Mix_Chunk * mosaic_snd_effect[mosaic_NUM_TOOLS];
 
 const char * mosaic_snd_filenames[mosaic_NUM_TOOLS] = {
-  "flip.wav",
+  "flip.wav", /* FIXME */
 };
 const char * mosaic_icon_filenames[mosaic_NUM_TOOLS] = {
-  "flip.png",
+  "mosaic.png",
 };
 const char * mosaic_names[mosaic_NUM_TOOLS] = {
   gettext_noop("Mosaic"),

magic/src/sharpen.c

@@ -6,7 +6,7 @@
 
   Credits: Andrew Corcoran <akanewbie@gmail.com>
 
-  Copyright (c) 2002-2008 by Bill Kendrick and others; see AUTHORS.txt
+  Copyright (c) 2002-2009 by Bill Kendrick and others; see AUTHORS.txt
   bill@newbreedsoftware.com
   http://www.tuxpaint.org/
 
@@ -25,7 +25,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  Last updated: July 8, 2008
+  Last updated: May 6, 2009
   $Id$
 */
 
@@ -62,12 +62,12 @@ static Mix_Chunk * sharpen_snd_effect[sharpen_NUM_TOOLS];
 const char * sharpen_snd_filenames[sharpen_NUM_TOOLS] = {
   "edges.ogg",
   "sharpen.ogg",
-  "flip.wav"
+  "flip.wav" /* FIXME */
 };
 const char * sharpen_icon_filenames[sharpen_NUM_TOOLS] = {
   "edges.png",
   "sharpen.png",
-  "flip.png"
+  "silhouette.png"
 };
 const char * sharpen_names[sharpen_NUM_TOOLS] = {
   gettext_noop("Edges"),

magic/src/tint.c

@@ -10,7 +10,7 @@
 
   Credits: Andrew Corcoran <akanewbie@gmail.com>
 
-  Copyright (c) 2002-2008 by Bill Kendrick and others; see AUTHORS.txt
+  Copyright (c) 2002-2009 by Bill Kendrick and others; see AUTHORS.txt
   bill@newbreedsoftware.com
   http://www.tuxpaint.org/
 
@@ -29,7 +29,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  Last updated: July 8, 2008
+  Last updated: May 6, 2009
   $Id$
 */
 
@@ -61,11 +61,11 @@ static Mix_Chunk * tint_snd_effect[tint_NUM_TOOLS];
 
 const char * tint_snd_filenames[tint_NUM_TOOLS] = {
   "tint.wav",
-  "flip.wav"
+  "flip.wav" /* FIXME */
 };
 const char * tint_icon_filenames[tint_NUM_TOOLS] = {
   "tint.png",
-  "flip.png"
+  "colornwhite.png"
 };
 const char * tint_names[tint_NUM_TOOLS] = {
   gettext_noop("Tint"),

magic/src/waves.c

@@ -64,7 +64,7 @@ SDL_Surface * waves_get_icon(magic_api * api, int which)
   char fname[1024];
 
   if (!which) snprintf(fname, sizeof(fname), "%s/images/magic/waves.png", api->data_directory);
-  else snprintf(fname, sizeof(fname), "%s/images/magic/waves-v.png", api->data_directory);
+  else snprintf(fname, sizeof(fname), "%s/images/magic/wavelet.png", api->data_directory);
 
   return(IMG_Load(fname));
 }