diff --git a/Makefile b/Makefile index fa36ae976..d2569b061 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - September 17, 2021 +# June 14, 2002 - September 20, 2021 # The version number, for release: @@ -15,7 +15,7 @@ ifdef SOURCE_DATE_EPOCH else VER_DATE=$(shell date "+%Y-%m-%d") endif -MAGIC_API_VERSION:=0x00000004 +MAGIC_API_VERSION:=0x00000005 # Need to know the OS diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 8be9bfcac..0b6cc7352 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -36,6 +36,10 @@ $Id$ * Other Improvements: ------------------- + * WIP - Group Magic tools into sub-sections. + (Closes https://sourceforge.net/p/tuxpaint/feature-requests/201/) + Note: Bumps `TP_MAGIC_API_VERSION` to 0x00000005. + * Rotational brushes now supported. Unlike "directional" brushes, in which a 3x3 grid representing the 8 cardinal directions (45 degree steps) is used, only a single brush image diff --git a/magic/magic-docs/en/fretwork.txt b/magic/magic-docs/en/fretwork.txt new file mode 100644 index 000000000..05d8a9a8d --- /dev/null +++ b/magic/magic-docs/en/fretwork.txt @@ -0,0 +1,5 @@ + Tux Paint "Magic" Tool: Fretwork + + By Pere Pujal i Carabantes + + Draw an interlaced decorative design that looks like wooden fretwork. diff --git a/magic/magic-docs/en/html/fretwork.html b/magic/magic-docs/en/html/fretwork.html new file mode 100644 index 000000000..b3ad6bd1b --- /dev/null +++ b/magic/magic-docs/en/html/fretwork.html @@ -0,0 +1,9 @@ + +Tux Paint "Magic" Tool: Fretwork + + + +

Tux Paint "Magic" Tool: Fretwork

+

By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

+

Draw an interlaced decorative design that looks like wooden fretwork.

+ \ No newline at end of file diff --git a/magic/magic-docs/en/html/index.html b/magic/magic-docs/en/html/index.html index 7e1f845c4..701c2fca8 100644 --- a/magic/magic-docs/en/html/index.html +++ b/magic/magic-docs/en/html/index.html @@ -26,6 +26,7 @@
  • Flower
  • Foam
  • Fold
    • +
  • Fretwork
  • Glass Tile
  • Grass
  • Halftone
    • diff --git a/magic/magic-docs/en/index.txt b/magic/magic-docs/en/index.txt index 4de816a1b..2bae5c024 100644 --- a/magic/magic-docs/en/index.txt +++ b/magic/magic-docs/en/index.txt @@ -22,6 +22,7 @@ * Flower * Foam * Fold + * Fretwork * Glass Tile * Grass * Halftone diff --git a/magic/magic-docs/src/magic-docs.php b/magic/magic-docs/src/magic-docs.php index 390505c3a..560f9b191 100644 --- a/magic/magic-docs/src/magic-docs.php +++ b/magic/magic-docs/src/magic-docs.php @@ -5,7 +5,7 @@ individual HTML files for each of them, and an index.html that links to them all. */ /* Bill Kendrick */ -/* Oct. 8, 2009 - September 6, 2021 */ +/* Oct. 8, 2009 - September 20, 2021 */ /* Authors of the Magic tools: */ @@ -145,6 +145,10 @@ $tools = array( 'desc'=>'Click a corner of your picture and drag towards the center to fold it up like a piece of paper.', 'author'=>array($AUTHOR_ADAMR, $AUTHOR_KENDRICK, $AUTHOR_PERE)), + array('name'=>'Fretwork', + 'desc'=>'Draw an interlaced decorative design that looks like wooden fretwork.', + 'author'=>$AUTHOR_PERE), + array('name'=>'Glass Tile', 'desc'=>'Click and drag over your picture to make it look like it\'s being seen through glass tiles.', 'author'=>$AUTHOR_KENDRICK), diff --git a/src/tp_magic_api.h.in b/src/tp_magic_api.h.in index d8c816573..84aca4d8e 100644 --- a/src/tp_magic_api.h.in +++ b/src/tp_magic_api.h.in @@ -168,5 +168,16 @@ typedef struct magic_api_t { #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) #endif /* ATTRIBUTE_UNUSED */ +/* Pre-defined Magic tool grouping codes */ +enum { + MAGIC_TYPE_DISTORTS, + MAGIC_TYPE_COLOR_FILTERS, + MAGIC_TYPE_PICTURE_WARPS, + MAGIC_TYPE_PAINTING, + MAGIC_TYPE_PATTERN_PAINTING, + MAGIC_TYPE_PICTURE_DECORATIONS, + MAGIC_TYPE_ARTISTIC +}; + #endif