From a9515c351e3514e21fe3ab3ae5db23e691704076 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Tue, 16 Jan 2024 23:10:08 -0800 Subject: [PATCH] Gave ordering to all Painting magic tools All done! --- magic/src/bricks.c | 11 +++++++++-- magic/src/calligraphy.c | 11 +++++++++-- magic/src/confetti.c | 8 +++++++- magic/src/foam.c | 15 +++++++++++---- magic/src/fretwork.c | 8 +++++++- magic/src/grass.c | 11 +++++++++-- magic/src/light.c | 11 +++++++++-- magic/src/maze.c | 8 +++++++- magic/src/metalpaint.c | 11 +++++++++-- magic/src/pixels.c | 13 +++++++++++-- magic/src/rails.c | 8 +++++++- magic/src/rain.c | 15 +++++++++++++-- magic/src/rainbow.c | 11 +++++++++-- magic/src/ribbon.c | 11 +++++++++-- magic/src/smooth.c | 11 +++++++++-- magic/src/smudge.c | 2 +- magic/src/swirls.c | 2 +- magic/src/toothpaste.c | 15 +++++++++++++-- 18 files changed, 150 insertions(+), 32 deletions(-) diff --git a/magic/src/bricks.c b/magic/src/bricks.c index d30a3f590..e8eb66cda 100644 --- a/magic/src/bricks.c +++ b/magic/src/bricks.c @@ -6,7 +6,7 @@ Albert Cahalan - 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 https://tuxpaint.org/ @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -62,6 +62,7 @@ int bricks_get_tool_count(magic_api * api); SDL_Surface *bricks_get_icon(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_order(int which); char *bricks_get_description(magic_api * api, int which, int mode); 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); @@ -141,6 +142,12 @@ int bricks_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE return MAGIC_TYPE_PAINTING; } +// Return our order: +int bricks_get_order(int which) +{ + return 100 + which; +} + // Return our descriptions, localized: char *bricks_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/calligraphy.c b/magic/src/calligraphy.c index 3aa20f815..6c526f1f6 100644 --- a/magic/src/calligraphy.c +++ b/magic/src/calligraphy.c @@ -4,7 +4,7 @@ Calligraphy Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -58,6 +58,7 @@ int calligraphy_get_tool_count(magic_api * api); SDL_Surface *calligraphy_get_icon(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_order(int which); char *calligraphy_get_description(magic_api * api, int which, int mode); 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); @@ -137,6 +138,12 @@ int calligraphy_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_ return MAGIC_TYPE_PAINTING; } +// Return our order +int calligraphy_get_order(int which ATTRIBUTE_UNUSED) +{ + return 1100; +} + // Return our description, localized: char *calligraphy_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) diff --git a/magic/src/confetti.c b/magic/src/confetti.c index a906385dc..d1c1a5f3e 100644 --- a/magic/src/confetti.c +++ b/magic/src/confetti.c @@ -1,5 +1,5 @@ /* - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include //For time() @@ -34,6 +34,7 @@ int confetti_get_tool_count(magic_api * api); SDL_Surface *confetti_get_icon(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_order(int which); char *confetti_get_description(magic_api * api, int which, int mode); int confetti_requires_colors(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; } +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) { return strdup(gettext_noop("Click to throw confetti!")); diff --git a/magic/src/foam.c b/magic/src/foam.c index e333478ac..cb8704ecf 100644 --- a/magic/src/foam.c +++ b/magic/src/foam.c @@ -4,7 +4,7 @@ Foam Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -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, SDL_Surface * last, int x, int y, SDL_Rect * update_rect); SDL_Surface *foam_get_icon(magic_api * api, int which); -char *foam_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED); -int foam_get_group(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, int which); +int foam_get_order(int which); 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_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 our orders +int foam_get_order(int which ATTRIBUTE_UNUSED) +{ + return 1600; +} + // Return our descriptions, localized: char *foam_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/fretwork.c b/magic/src/fretwork.c index 701afd9d8..2dc8d3cd2 100644 --- a/magic/src/fretwork.c +++ b/magic/src/fretwork.c @@ -1,7 +1,7 @@ /* Draws fretwork - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #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); char *fretwork_get_name(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); int fretwork_requires_colors(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; } +int fretwork_get_order(int which ATTRIBUTE_UNUSED) +{ + return 2100; +} + char *fretwork_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { return strdup(gettext_noop("Fretwork")); diff --git a/magic/src/grass.c b/magic/src/grass.c index 1126e4e83..04b8f48af 100644 --- a/magic/src/grass.c +++ b/magic/src/grass.c @@ -5,7 +5,7 @@ Tux Paint - A simple drawing program for children. by Albert Cahalan - 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 https://tuxpaint.org/ @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -47,6 +47,7 @@ int grass_get_tool_count(magic_api * api); SDL_Surface *grass_get_icon(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_order(int which); char *grass_get_description(magic_api * api, int which, int mode); 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); @@ -117,6 +118,12 @@ int grass_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED return MAGIC_TYPE_PAINTING; } +// Return our orders: +int grass_get_order(int which ATTRIBUTE_UNUSED) +{ + return 1700; +} + // Return our descriptions, localized: char *grass_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/light.c b/magic/src/light.c index f568cc2bc..25559f45b 100644 --- a/magic/src/light.c +++ b/magic/src/light.c @@ -4,7 +4,7 @@ Light Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -49,6 +49,7 @@ int light_get_tool_count(magic_api * api); SDL_Surface *light_get_icon(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_order(int which); 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); 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 our orders: +int light_get_order(int which ATTRIBUTE_UNUSED) +{ + return 2600; +} + // Return our descriptions, localized: char *light_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/maze.c b/magic/src/maze.c index 35496cc7a..35d1e3b6d 100644 --- a/magic/src/maze.c +++ b/magic/src/maze.c @@ -2,7 +2,7 @@ Allows painting generated maze puzzles on your picture. - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -48,6 +48,7 @@ int maze_get_tool_count(magic_api * api); SDL_Surface *maze_get_icon(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_order(int which); char *maze_get_description(magic_api * api, int which, int mode); int maze_requires_colors(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; } +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) { if (mode == MODE_PAINT) diff --git a/magic/src/metalpaint.c b/magic/src/metalpaint.c index f968a809a..fe191173c 100644 --- a/magic/src/metalpaint.c +++ b/magic/src/metalpaint.c @@ -4,7 +4,7 @@ Metal Paint Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -44,6 +44,7 @@ int metalpaint_get_tool_count(magic_api * api); SDL_Surface *metalpaint_get_icon(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_order(int which); 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); 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 our orders: +int metalpaint_get_order(int which ATTRIBUTE_UNUSED) +{ + return 2300; +} + // Return our descriptions, localized: char *metalpaint_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) diff --git a/magic/src/pixels.c b/magic/src/pixels.c index 5480731a1..0639b2f48 100644 --- a/magic/src/pixels.c +++ b/magic/src/pixels.c @@ -4,7 +4,7 @@ Pixel art paintbrush Magic Tools Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (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 @@ -56,6 +58,7 @@ int pixels_get_tool_count(magic_api * api); SDL_Surface *pixels_get_icon(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_order(int which); char *pixels_get_description(magic_api * api, int which, int mode); 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); @@ -120,6 +123,12 @@ int pixels_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE return MAGIC_TYPE_PAINTING; } +// Return our order: +int pixels_get_order(int which ATTRIBUTE_UNUSED) +{ + return 1900; +} + // Return our descriptions, localized: char *pixels_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/rails.c b/magic/src/rails.c index 8c7dd56f4..a3451a7e9 100644 --- a/magic/src/rails.c +++ b/magic/src/rails.c @@ -3,7 +3,7 @@ Draw train tracks. - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include "tp_magic_api.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); char *rails_get_name(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); int rails_requires_colors(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; } +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) { return strdup(gettext_noop("Click and drag to draw train track rails on your picture.")); diff --git a/magic/src/rain.c b/magic/src/rain.c index 3ffd3a588..849dd956d 100644 --- a/magic/src/rain.c +++ b/magic/src/rain.c @@ -6,7 +6,7 @@ Credits: Andrew Corcoran - 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 https://tuxpaint.org/ @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -71,6 +71,10 @@ const int rain_groups[rain_NUM_TOOLS] = { MAGIC_TYPE_PAINTING, }; +const int rain_orders[rain_NUM_TOOLS] = { + 1500, +}; + const char *rain_descs[rain_NUM_TOOLS][2] = { {gettext_noop("Click to place a rain drop onto your picture."), 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); char *rain_get_name(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); 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); @@ -161,6 +166,12 @@ int rain_get_group(magic_api * api ATTRIBUTE_UNUSED, int which) return rain_groups[which]; } +// Return our orders +int rain_get_order(int which) +{ + return rain_orders[which]; +} + // Return our descriptions, localized: char *rain_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) { diff --git a/magic/src/rainbow.c b/magic/src/rainbow.c index 71078bea9..3aa31d106 100644 --- a/magic/src/rainbow.c +++ b/magic/src/rainbow.c @@ -4,7 +4,7 @@ Rainbow Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -83,6 +83,7 @@ int rainbow_get_tool_count(magic_api * api); SDL_Surface *rainbow_get_icon(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_order(int which); 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); @@ -169,6 +170,12 @@ int rainbow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUS return MAGIC_TYPE_PAINTING; } +// Return our order: +int rainbow_get_order(int which) +{ + return 1000 + which; +} + // Return our descriptions, localized: char *rainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/ribbon.c b/magic/src/ribbon.c index 9602237e7..52f203180 100644 --- a/magic/src/ribbon.c +++ b/magic/src/ribbon.c @@ -4,7 +4,7 @@ Ribbon Magic Tool Plugin 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 https://tuxpaint.org/ @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -53,6 +53,7 @@ int ribbon_get_tool_count(magic_api * api); SDL_Surface *ribbon_get_icon(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_order(int which); 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); @@ -123,6 +124,12 @@ int ribbon_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE return MAGIC_TYPE_PAINTING; } +// Return our order: +int ribbon_get_order(int which ATTRIBUTE_UNUSED) +{ + return 1200; +} + // Return our descriptions, localized: char *ribbon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { diff --git a/magic/src/smooth.c b/magic/src/smooth.c index eb0987793..f9c08ba60 100644 --- a/magic/src/smooth.c +++ b/magic/src/smooth.c @@ -9,7 +9,7 @@ Idea: Pere Pujal i Carabantes (https://sourceforge.net/p/tuxpaint/feature-requests/238/) 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 https://tuxpaint.org/ @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: Januayr 16, 2024 */ #include @@ -101,6 +101,7 @@ int smooth_get_tool_count(magic_api * api); SDL_Surface *smooth_get_icon(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_order(int which); 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_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 our order +int smooth_get_order(int which) +{ + return 1300 + which; +} + // Return our description, localized: char *smooth_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) diff --git a/magic/src/smudge.c b/magic/src/smudge.c index 5f7171b98..aca63ef94 100644 --- a/magic/src/smudge.c +++ b/magic/src/smudge.c @@ -128,7 +128,7 @@ int smudge_get_order(int which) if (which == 0) return 3; /* within MAGIC_TYPE_DISTORTS */ else - return 0; /* FIXME */ /* within MAGIC_TYPE_PAINTING */ + return 2500; /* within MAGIC_TYPE_PAINTING */ } // Return our descriptions, localized: diff --git a/magic/src/swirls.c b/magic/src/swirls.c index 8423d3afb..54b22ccc1 100644 --- a/magic/src/swirls.c +++ b/magic/src/swirls.c @@ -36,7 +36,7 @@ char *swirl_names[NUM_SWIRL_TOOLS] = { int swirls_orders[NUM_SWIRL_TOOLS] = { 200, /* 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] = { diff --git a/magic/src/toothpaste.c b/magic/src/toothpaste.c index 51ddbd8c7..4212a7d2a 100644 --- a/magic/src/toothpaste.c +++ b/magic/src/toothpaste.c @@ -6,7 +6,7 @@ Credits: Andrew Corcoran - 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 https://tuxpaint.org/ @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: December 29, 2023 + Last updated: January 16, 2024 */ #include @@ -71,6 +71,10 @@ const int toothpaste_groups[toothpaste_NUM_TOOLS] = { MAGIC_TYPE_PAINTING, }; +const int toothpaste_orders[toothpaste_NUM_TOOLS] = { + 2400, +}; + const char *toothpaste_descs[toothpaste_NUM_TOOLS] = { 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); char *toothpaste_get_name(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); 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, @@ -186,6 +191,12 @@ int toothpaste_get_group(magic_api * api ATTRIBUTE_UNUSED, int which) return toothpaste_groups[which]; } +// Return our orders: +int toothpaste_get_order(int which) +{ + return toothpaste_orders[which]; +} + // Return our descriptions, localized: char *toothpaste_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED) {