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

Gave ordering to all Painting magic tools

Browse source 
All done!
This commit is contained in:
Bill Kendrick 2024-01-16 23:10:08 -08:00
parent e3cb845426
commit a9515c351e
18 changed files with 150 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
magic/src/bricks.c
View file

@ -6,7 +6,7 @@
Albert Cahalan <albert@users.sf.net> Albert Cahalan <albert@users.sf.net>
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -25,7 +25,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -62,6 +62,7 @@ int bricks_get_tool_count(magic_api * api);
SDL_Surface *bricks_get_icon(magic_api * api, int which); SDL_Surface *bricks_get_icon(magic_api * api, int which);
char *bricks_get_name(magic_api * api, int which); char *bricks_get_name(magic_api * api, int which);
int bricks_get_group(magic_api * api, int which); int bricks_get_group(magic_api * api, int which);
int bricks_get_order(int which);
char *bricks_get_description(magic_api * api, int which, int mode); char *bricks_get_description(magic_api * api, int which, int mode);
void bricks_drag(magic_api * api, int which, SDL_Surface * canvas, void bricks_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
@ -141,6 +142,12 @@ int bricks_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order:
int bricks_get_order(int which)
{
return 100 + which;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *bricks_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *bricks_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {

11
magic/src/calligraphy.c
View file

@ -4,7 +4,7 @@
Calligraphy Magic Tool Plugin Calligraphy Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -58,6 +58,7 @@ int calligraphy_get_tool_count(magic_api * api);
SDL_Surface *calligraphy_get_icon(magic_api * api, int which); SDL_Surface *calligraphy_get_icon(magic_api * api, int which);
char *calligraphy_get_name(magic_api * api, int which); char *calligraphy_get_name(magic_api * api, int which);
int calligraphy_get_group(magic_api * api, int which); int calligraphy_get_group(magic_api * api, int which);
int calligraphy_get_order(int which);
char *calligraphy_get_description(magic_api * api, int which, int mode); char *calligraphy_get_description(magic_api * api, int which, int mode);
void calligraphy_drag(magic_api * api, int which, SDL_Surface * canvas, void calligraphy_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
@ -137,6 +138,12 @@ int calligraphy_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order
int calligraphy_get_order(int which ATTRIBUTE_UNUSED)
{
return 1100;
}
// Return our description, localized: // Return our description, localized:
char *calligraphy_get_description(magic_api * api ATTRIBUTE_UNUSED, char *calligraphy_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)

8
magic/src/confetti.c
View file

@ -1,5 +1,5 @@
/* /*
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <time.h> //For time() #include <time.h> //For time()
@ -34,6 +34,7 @@ int confetti_get_tool_count(magic_api * api);
SDL_Surface *confetti_get_icon(magic_api * api, int which); SDL_Surface *confetti_get_icon(magic_api * api, int which);
char *confetti_get_name(magic_api * api, int which); char *confetti_get_name(magic_api * api, int which);
int confetti_get_group(magic_api * api, int which); int confetti_get_group(magic_api * api, int which);
int confetti_get_order(int which);
char *confetti_get_description(magic_api * api, int which, int mode); char *confetti_get_description(magic_api * api, int which, int mode);
int confetti_requires_colors(magic_api * api, int which); int confetti_requires_colors(magic_api * api, int which);
void confetti_release(magic_api * api, int which, void confetti_release(magic_api * api, int which,
@ -106,6 +107,11 @@ int confetti_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
int confetti_get_order(int which ATTRIBUTE_UNUSED)
{
return 1400;
}
char *confetti_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *confetti_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click to throw confetti!")); return strdup(gettext_noop("Click to throw confetti!"));

15
magic/src/foam.c
View file

@ -4,7 +4,7 @@
Foam Magic Tool Plugin Foam Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -52,8 +52,9 @@ void foam_drag(magic_api * api, int which, SDL_Surface * canvas,
void foam_click(magic_api * api, int which, int mode, SDL_Surface * canvas, void foam_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
SDL_Surface * last, int x, int y, SDL_Rect * update_rect); SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
SDL_Surface *foam_get_icon(magic_api * api, int which); SDL_Surface *foam_get_icon(magic_api * api, int which);
char *foam_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED); char *foam_get_name(magic_api * api, int which);
int foam_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED); int foam_get_group(magic_api * api, int which);
int foam_get_order(int which);
void foam_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); void foam_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
void foam_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); void foam_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
void foam_set_color(magic_api * api, int which, SDL_Surface * canvas, void foam_set_color(magic_api * api, int which, SDL_Surface * canvas,
@ -137,6 +138,12 @@ int foam_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our orders
int foam_get_order(int which ATTRIBUTE_UNUSED)
{
return 1600;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *foam_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *foam_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

8
magic/src/fretwork.c
View file

@ -1,7 +1,7 @@
/* /*
Draws fretwork Draws fretwork
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -64,6 +64,7 @@ int fretwork_get_tool_count(magic_api * api);
SDL_Surface *fretwork_get_icon(magic_api * api, int which); SDL_Surface *fretwork_get_icon(magic_api * api, int which);
char *fretwork_get_name(magic_api * api, int which); char *fretwork_get_name(magic_api * api, int which);
int fretwork_get_group(magic_api * api, int which); int fretwork_get_group(magic_api * api, int which);
int fretwork_get_order(int which);
char *fretwork_get_description(magic_api * api, int which, int mode); char *fretwork_get_description(magic_api * api, int which, int mode);
int fretwork_requires_colors(magic_api * api, int which); int fretwork_requires_colors(magic_api * api, int which);
void fretwork_release(magic_api * api, int which, void fretwork_release(magic_api * api, int which,
@ -207,6 +208,11 @@ int fretwork_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
int fretwork_get_order(int which ATTRIBUTE_UNUSED)
{
return 2100;
}
char *fretwork_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) char *fretwork_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Fretwork")); return strdup(gettext_noop("Fretwork"));

11
magic/src/grass.c
View file

@ -5,7 +5,7 @@
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
by Albert Cahalan <albert@users.sf.net> by Albert Cahalan <albert@users.sf.net>
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -24,7 +24,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -47,6 +47,7 @@ int grass_get_tool_count(magic_api * api);
SDL_Surface *grass_get_icon(magic_api * api, int which); SDL_Surface *grass_get_icon(magic_api * api, int which);
char *grass_get_name(magic_api * api, int which); char *grass_get_name(magic_api * api, int which);
int grass_get_group(magic_api * api, int which); int grass_get_group(magic_api * api, int which);
int grass_get_order(int which);
char *grass_get_description(magic_api * api, int which, int mode); char *grass_get_description(magic_api * api, int which, int mode);
void grass_drag(magic_api * api, int which, SDL_Surface * canvas, void grass_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
@ -117,6 +118,12 @@ int grass_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our orders:
int grass_get_order(int which ATTRIBUTE_UNUSED)
{
return 1700;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *grass_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *grass_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

11
magic/src/light.c
View file

@ -4,7 +4,7 @@
Light Magic Tool Plugin Light Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -49,6 +49,7 @@ int light_get_tool_count(magic_api * api);
SDL_Surface *light_get_icon(magic_api * api, int which); SDL_Surface *light_get_icon(magic_api * api, int which);
char *light_get_name(magic_api * api, int which); char *light_get_name(magic_api * api, int which);
int light_get_group(magic_api * api, int which); int light_get_group(magic_api * api, int which);
int light_get_order(int which);
char *light_get_description(magic_api * api, int which, int mode); char *light_get_description(magic_api * api, int which, int mode);
static void do_light(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void do_light(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
void light_drag(magic_api * api, int which, SDL_Surface * canvas, void light_drag(magic_api * api, int which, SDL_Surface * canvas,
@ -118,6 +119,12 @@ int light_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our orders:
int light_get_order(int which ATTRIBUTE_UNUSED)
{
return 2600;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *light_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *light_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

8
magic/src/maze.c
View file

@ -2,7 +2,7 @@
Allows painting generated maze puzzles on your picture. Allows painting generated maze puzzles on your picture.
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -48,6 +48,7 @@ int maze_get_tool_count(magic_api * api);
SDL_Surface *maze_get_icon(magic_api * api, int which); SDL_Surface *maze_get_icon(magic_api * api, int which);
char *maze_get_name(magic_api * api, int which); char *maze_get_name(magic_api * api, int which);
int maze_get_group(magic_api * api, int which); int maze_get_group(magic_api * api, int which);
int maze_get_order(int which);
char *maze_get_description(magic_api * api, int which, int mode); char *maze_get_description(magic_api * api, int which, int mode);
int maze_requires_colors(magic_api * api, int which); int maze_requires_colors(magic_api * api, int which);
int maze_modes(magic_api * api, int which); int maze_modes(magic_api * api, int which);
@ -115,6 +116,11 @@ int maze_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
int maze_get_order(int which ATTRIBUTE_UNUSED)
{
return 2000;
}
char *maze_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) char *maze_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode)
{ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)

11
magic/src/metalpaint.c
View file

@ -4,7 +4,7 @@
Metal Paint Magic Tool Plugin Metal Paint Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -44,6 +44,7 @@ int metalpaint_get_tool_count(magic_api * api);
SDL_Surface *metalpaint_get_icon(magic_api * api, int which); SDL_Surface *metalpaint_get_icon(magic_api * api, int which);
char *metalpaint_get_name(magic_api * api, int which); char *metalpaint_get_name(magic_api * api, int which);
int metalpaint_get_group(magic_api * api, int which); int metalpaint_get_group(magic_api * api, int which);
int metalpaint_get_order(int which);
char *metalpaint_get_description(magic_api * api, int which, int mode); char *metalpaint_get_description(magic_api * api, int which, int mode);
static void do_metalpaint(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void do_metalpaint(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
void metalpaint_drag(magic_api * api, int which, SDL_Surface * canvas, void metalpaint_drag(magic_api * api, int which, SDL_Surface * canvas,
@ -110,6 +111,12 @@ int metalpaint_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_U
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our orders:
int metalpaint_get_order(int which ATTRIBUTE_UNUSED)
{
return 2300;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *metalpaint_get_description(magic_api * api ATTRIBUTE_UNUSED, char *metalpaint_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)

13
magic/src/pixels.c
View file

@ -4,7 +4,7 @@
Pixel art paintbrush Magic Tools Plugin Pixel art paintbrush Magic Tools Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,9 @@
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)
Last updated: December 29, 2023 FIXME: If --nomagicsizes set, offer at least a couple size variations. -bjk 2024.01.16
Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -56,6 +58,7 @@ int pixels_get_tool_count(magic_api * api);
SDL_Surface *pixels_get_icon(magic_api * api, int which); SDL_Surface *pixels_get_icon(magic_api * api, int which);
char *pixels_get_name(magic_api * api, int which); char *pixels_get_name(magic_api * api, int which);
int pixels_get_group(magic_api * api, int which); int pixels_get_group(magic_api * api, int which);
int pixels_get_order(int which);
char *pixels_get_description(magic_api * api, int which, int mode); char *pixels_get_description(magic_api * api, int which, int mode);
void pixels_drag(magic_api * api, int which, SDL_Surface * canvas, void pixels_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
@ -120,6 +123,12 @@ int pixels_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order:
int pixels_get_order(int which ATTRIBUTE_UNUSED)
{
return 1900;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *pixels_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *pixels_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

8
magic/src/rails.c
View file

@ -3,7 +3,7 @@
Draw train tracks. Draw train tracks.
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
#include "SDL_image.h" #include "SDL_image.h"
@ -57,6 +57,7 @@ int rails_get_tool_count(magic_api * api);
SDL_Surface *rails_get_icon(magic_api * api, int which); SDL_Surface *rails_get_icon(magic_api * api, int which);
char *rails_get_name(magic_api * api, int which); char *rails_get_name(magic_api * api, int which);
int rails_get_group(magic_api * api, int which); int rails_get_group(magic_api * api, int which);
int rails_get_order(int which);
char *rails_get_description(magic_api * api, int which, int mode); char *rails_get_description(magic_api * api, int which, int mode);
int rails_requires_colors(magic_api * api, int which); int rails_requires_colors(magic_api * api, int which);
void rails_release(magic_api * api, int which, void rails_release(magic_api * api, int which,
@ -172,6 +173,11 @@ int rails_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
int rails_get_order(int which ATTRIBUTE_UNUSED)
{
return 2200;
}
char *rails_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *rails_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return strdup(gettext_noop("Click and drag to draw train track rails on your picture.")); return strdup(gettext_noop("Click and drag to draw train track rails on your picture."));

15
magic/src/rain.c
View file

@ -6,7 +6,7 @@
Credits: Andrew Corcoran <akanewbie@gmail.com> Credits: Andrew Corcoran <akanewbie@gmail.com>
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -25,7 +25,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -71,6 +71,10 @@ const int rain_groups[rain_NUM_TOOLS] = {
MAGIC_TYPE_PAINTING, MAGIC_TYPE_PAINTING,
}; };
const int rain_orders[rain_NUM_TOOLS] = {
1500,
};
const char *rain_descs[rain_NUM_TOOLS][2] = { const char *rain_descs[rain_NUM_TOOLS][2] = {
{gettext_noop("Click to place a rain drop onto your picture."), {gettext_noop("Click to place a rain drop onto your picture."),
gettext_noop("Click to cover your picture with rain drops."),}, gettext_noop("Click to cover your picture with rain drops."),},
@ -82,6 +86,7 @@ int rain_get_tool_count(magic_api * api);
SDL_Surface *rain_get_icon(magic_api * api, int which); SDL_Surface *rain_get_icon(magic_api * api, int which);
char *rain_get_name(magic_api * api, int which); char *rain_get_name(magic_api * api, int which);
int rain_get_group(magic_api * api, int which); int rain_get_group(magic_api * api, int which);
int rain_get_order(int which);
char *rain_get_description(magic_api * api, int which, int mode); char *rain_get_description(magic_api * api, int which, int mode);
static void do_rain_drop(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void do_rain_drop(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
static void rain_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void rain_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
@ -161,6 +166,12 @@ int rain_get_group(magic_api * api ATTRIBUTE_UNUSED, int which)
return rain_groups[which]; return rain_groups[which];
} }
// Return our orders
int rain_get_order(int which)
{
return rain_orders[which];
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *rain_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) char *rain_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{ {

11
magic/src/rainbow.c
View file

@ -4,7 +4,7 @@
Rainbow Magic Tool Plugin Rainbow Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -83,6 +83,7 @@ int rainbow_get_tool_count(magic_api * api);
SDL_Surface *rainbow_get_icon(magic_api * api, int which); SDL_Surface *rainbow_get_icon(magic_api * api, int which);
char *rainbow_get_name(magic_api * api, int which); char *rainbow_get_name(magic_api * api, int which);
int rainbow_get_group(magic_api * api, int which); int rainbow_get_group(magic_api * api, int which);
int rainbow_get_order(int which);
char *rainbow_get_description(magic_api * api, int which, int mode); char *rainbow_get_description(magic_api * api, int which, int mode);
static void rainbow_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void rainbow_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
@ -169,6 +170,12 @@ int rainbow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUS
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order:
int rainbow_get_order(int which)
{
return 1000 + which;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *rainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *rainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

11
magic/src/ribbon.c
View file

@ -4,7 +4,7 @@
Ribbon Magic Tool Plugin Ribbon Magic Tool Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2023-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2023-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -23,7 +23,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -53,6 +53,7 @@ int ribbon_get_tool_count(magic_api * api);
SDL_Surface *ribbon_get_icon(magic_api * api, int which); SDL_Surface *ribbon_get_icon(magic_api * api, int which);
char *ribbon_get_name(magic_api * api, int which); char *ribbon_get_name(magic_api * api, int which);
int ribbon_get_group(magic_api * api, int which); int ribbon_get_group(magic_api * api, int which);
int ribbon_get_order(int which);
char *ribbon_get_description(magic_api * api, int which, int mode); char *ribbon_get_description(magic_api * api, int which, int mode);
static void ribbon_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void ribbon_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
@ -123,6 +124,12 @@ int ribbon_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order:
int ribbon_get_order(int which ATTRIBUTE_UNUSED)
{
return 1200;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *ribbon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *ribbon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

11
magic/src/smooth.c
View file

@ -9,7 +9,7 @@
Idea: Pere Pujal i Carabantes (https://sourceforge.net/p/tuxpaint/feature-requests/238/) Idea: Pere Pujal i Carabantes (https://sourceforge.net/p/tuxpaint/feature-requests/238/)
Based on: calligraphy.c by Bill Kendrick Based on: calligraphy.c by Bill Kendrick
Copyright (c) 2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -28,7 +28,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)
Last updated: December 29, 2023 Last updated: Januayr 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -101,6 +101,7 @@ int smooth_get_tool_count(magic_api * api);
SDL_Surface *smooth_get_icon(magic_api * api, int which); SDL_Surface *smooth_get_icon(magic_api * api, int which);
char *smooth_get_name(magic_api * api, int which); char *smooth_get_name(magic_api * api, int which);
int smooth_get_group(magic_api * api, int which); int smooth_get_group(magic_api * api, int which);
int smooth_get_order(int which);
char *smooth_get_description(magic_api * api, int which, int mode); char *smooth_get_description(magic_api * api, int which, int mode);
static void smooth_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void smooth_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
static void smooth_squiggle_linecb(void *ptr, int which, static void smooth_squiggle_linecb(void *ptr, int which,
@ -170,6 +171,12 @@ int smooth_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE
return MAGIC_TYPE_PAINTING; return MAGIC_TYPE_PAINTING;
} }
// Return our order
int smooth_get_order(int which)
{
return 1300 + which;
}
// Return our description, localized: // Return our description, localized:
char *smooth_get_description(magic_api * api ATTRIBUTE_UNUSED, char *smooth_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which, int mode ATTRIBUTE_UNUSED) int which, int mode ATTRIBUTE_UNUSED)

2
magic/src/smudge.c
View file

@ -128,7 +128,7 @@ int smudge_get_order(int which)
if (which == 0) if (which == 0)
return 3; /* within MAGIC_TYPE_DISTORTS */ return 3; /* within MAGIC_TYPE_DISTORTS */
else else
return 0; /* FIXME */ /* within MAGIC_TYPE_PAINTING */ return 2500; /* within MAGIC_TYPE_PAINTING */
} }
// Return our descriptions, localized: // Return our descriptions, localized:

2
magic/src/swirls.c
View file

@ -36,7 +36,7 @@ char *swirl_names[NUM_SWIRL_TOOLS] = {
int swirls_orders[NUM_SWIRL_TOOLS] = { int swirls_orders[NUM_SWIRL_TOOLS] = {
200, /* within MAGIC_TYPE_DISTORTS */ 200, /* within MAGIC_TYPE_DISTORTS */
201, /* within MAGIC_TYPE_DISTORTS */ 201, /* within MAGIC_TYPE_DISTORTS */
0, /* FIXME */ /* within MAGIC_TYPE_PAINTING */ 1800, /* within MAGIC_TYPE_PAINTING */
}; };
char *swirl_descriptions[NUM_SWIRL_TOOLS][2] = { char *swirl_descriptions[NUM_SWIRL_TOOLS][2] = {

15
magic/src/toothpaste.c
View file

@ -6,7 +6,7 @@
Credits: Andrew Corcoran <akanewbie@gmail.com> Credits: Andrew Corcoran <akanewbie@gmail.com>
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -25,7 +25,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include <stdio.h> #include <stdio.h>
@ -71,6 +71,10 @@ const int toothpaste_groups[toothpaste_NUM_TOOLS] = {
MAGIC_TYPE_PAINTING, MAGIC_TYPE_PAINTING,
}; };
const int toothpaste_orders[toothpaste_NUM_TOOLS] = {
2400,
};
const char *toothpaste_descs[toothpaste_NUM_TOOLS] = { const char *toothpaste_descs[toothpaste_NUM_TOOLS] = {
gettext_noop("Click and drag to squirt toothpaste onto your picture."), gettext_noop("Click and drag to squirt toothpaste onto your picture."),
}; };
@ -82,6 +86,7 @@ int toothpaste_get_tool_count(magic_api * api);
SDL_Surface *toothpaste_get_icon(magic_api * api, int which); SDL_Surface *toothpaste_get_icon(magic_api * api, int which);
char *toothpaste_get_name(magic_api * api, int which); char *toothpaste_get_name(magic_api * api, int which);
int toothpaste_get_group(magic_api * api, int which); int toothpaste_get_group(magic_api * api, int which);
int toothpaste_get_order(int which);
char *toothpaste_get_description(magic_api * api, int which, int mode); char *toothpaste_get_description(magic_api * api, int which, int mode);
static void do_toothpaste(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); static void do_toothpaste(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
void toothpaste_drag(magic_api * api, int which, SDL_Surface * canvas, void toothpaste_drag(magic_api * api, int which, SDL_Surface * canvas,
@ -186,6 +191,12 @@ int toothpaste_get_group(magic_api * api ATTRIBUTE_UNUSED, int which)
return toothpaste_groups[which]; return toothpaste_groups[which];
} }
// Return our orders:
int toothpaste_get_order(int which)
{
return toothpaste_orders[which];
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *toothpaste_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) char *toothpaste_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
{ {