c42641fe89
2003-08-30 Michael Natterer <mitch@gimp.org> Fixed & cleaned up paint function registration to work without GUI. Finishes core/GUI separation for the paint tools: * app/core/gimppaintinfo.[ch]: removed "gchar *pdb_string" all over the place since we don't stroke using the PDB any more. (gimp_paint_info_new): create paint_info->paint_options here so the paint system is fully initialized when there is no GUI. * app/paint/paint.c: removed pdb_string stuff here, too. * app/core/gimptoolinfo.[ch]: create tool_info->tool_options only if tool_info->tool_options_type is not the same type as paint_info->paint_options_type (if we are no paint tool). * app/core/gimptooloptions.c: removed G_PARAM_CONSTRUCT_ONLY from the "tool-info" property. Instead, changed gimp_tool_options_set_property to ensure that it is only set once. * app/core/gimp.c (gimp_initialize): moved paint_init() after data_factory creation (was in gimp_init()), since GimpPaintInfo now creates the GimpPaintOptions, which are GimpContexts, which need gimp->*_factory to be constructed. * app/tools/tool_manager.c: don't create tool_info->tool_options here (it's not the job of the tool_manager to set up the core paint system correctly, it must be already initialized before any tool_manager function is called). Made "Stroke Selection" and "Stroke Path" work the same way: * app/paint/gimppaintcore-stroke.[ch]: added new function gimp_paint_core_stroke_boundary() which strokes without using the PDB. * app/core/gimpimage-mask.c (gimp_image_mask_stroke): use it instead of using the PDB. Enables all available paint options for stroke operations. Fixes bug #119411. * app/gui/vectors-commands.c (vectors_stroke_vectors) * app/core/gimpimage-mask.c (gimp_image_mask_stroke): removed all code which tries to figure how to stroke and simply look at the active tool's tool_info->paint_info, since it is always set up correctly now.
134 lines
3.7 KiB
C
134 lines
3.7 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "gimp.h"
|
|
#include "gimppaintinfo.h"
|
|
|
|
|
|
static void gimp_paint_info_class_init (GimpPaintInfoClass *klass);
|
|
static void gimp_paint_info_init (GimpPaintInfo *paint_info);
|
|
|
|
static void gimp_paint_info_finalize (GObject *object);
|
|
|
|
|
|
static GimpObjectClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_paint_info_get_type (void)
|
|
{
|
|
static GType paint_info_type = 0;
|
|
|
|
if (! paint_info_type)
|
|
{
|
|
static const GTypeInfo paint_info_info =
|
|
{
|
|
sizeof (GimpPaintInfoClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_paint_info_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpPaintInfo),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_paint_info_init,
|
|
};
|
|
|
|
paint_info_type = g_type_register_static (GIMP_TYPE_OBJECT,
|
|
"GimpPaintInfo",
|
|
&paint_info_info, 0);
|
|
}
|
|
|
|
return paint_info_type;
|
|
}
|
|
|
|
static void
|
|
gimp_paint_info_class_init (GimpPaintInfoClass *klass)
|
|
{
|
|
GObjectClass *object_class;
|
|
|
|
object_class = G_OBJECT_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->finalize = gimp_paint_info_finalize;
|
|
}
|
|
|
|
static void
|
|
gimp_paint_info_init (GimpPaintInfo *paint_info)
|
|
{
|
|
paint_info->gimp = NULL;
|
|
paint_info->paint_type = G_TYPE_NONE;
|
|
paint_info->blurb = NULL;
|
|
paint_info->paint_options = NULL;
|
|
}
|
|
|
|
static void
|
|
gimp_paint_info_finalize (GObject *object)
|
|
{
|
|
GimpPaintInfo *paint_info;
|
|
|
|
paint_info = GIMP_PAINT_INFO (object);
|
|
|
|
if (paint_info->blurb)
|
|
{
|
|
g_free (paint_info->blurb);
|
|
paint_info->blurb = NULL;
|
|
}
|
|
|
|
if (paint_info->paint_options)
|
|
{
|
|
g_object_unref (paint_info->paint_options);
|
|
paint_info->paint_options = NULL;
|
|
}
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
}
|
|
|
|
GimpPaintInfo *
|
|
gimp_paint_info_new (Gimp *gimp,
|
|
GType paint_type,
|
|
GType paint_options_type,
|
|
const gchar *blurb)
|
|
{
|
|
GimpPaintInfo *paint_info;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
g_return_val_if_fail (blurb != NULL, NULL);
|
|
|
|
paint_info = g_object_new (GIMP_TYPE_PAINT_INFO,
|
|
"name", g_type_name (paint_type),
|
|
NULL);
|
|
|
|
paint_info->gimp = gimp;
|
|
paint_info->paint_type = paint_type;
|
|
paint_info->paint_options_type = paint_options_type;
|
|
paint_info->blurb = g_strdup (blurb);
|
|
|
|
paint_info->paint_options = g_object_new (paint_info->paint_options_type,
|
|
"gimp", gimp,
|
|
NULL);
|
|
|
|
return paint_info;
|
|
}
|