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.
87 lines
3 KiB
C
87 lines
3 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.
|
|
*/
|
|
|
|
#ifndef __GIMP_TOOL_INFO_H__
|
|
#define __GIMP_TOOL_INFO_H__
|
|
|
|
|
|
#include "gimpdata.h"
|
|
|
|
|
|
#define GIMP_TYPE_TOOL_INFO (gimp_tool_info_get_type ())
|
|
#define GIMP_TOOL_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOOL_INFO, GimpToolInfo))
|
|
#define GIMP_TOOL_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_INFO, GimpToolInfoClass))
|
|
#define GIMP_IS_TOOL_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOOL_INFO))
|
|
#define GIMP_IS_TOOL_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_INFO))
|
|
#define GIMP_TOOL_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TOOL_INFO, GimpToolInfoClass))
|
|
|
|
|
|
typedef struct _GimpToolInfoClass GimpToolInfoClass;
|
|
|
|
struct _GimpToolInfo
|
|
{
|
|
GimpData parent_instance;
|
|
|
|
Gimp *gimp;
|
|
|
|
GType tool_type;
|
|
GType tool_options_type;
|
|
GimpContextPropMask context_props;
|
|
|
|
gchar *blurb;
|
|
gchar *help;
|
|
|
|
gchar *menu_path;
|
|
gchar *menu_accel;
|
|
|
|
gchar *help_domain;
|
|
gchar *help_id;
|
|
|
|
gboolean in_toolbox;
|
|
GimpToolOptions *tool_options;
|
|
GimpPaintInfo *paint_info;
|
|
};
|
|
|
|
struct _GimpToolInfoClass
|
|
{
|
|
GimpDataClass parent_class;
|
|
};
|
|
|
|
|
|
GType gimp_tool_info_get_type (void) G_GNUC_CONST;
|
|
|
|
GimpToolInfo * gimp_tool_info_new (Gimp *gimp,
|
|
GType tool_type,
|
|
GType tool_options_type,
|
|
GimpContextPropMask context_props,
|
|
const gchar *identifier,
|
|
const gchar *blurb,
|
|
const gchar *help,
|
|
const gchar *menu_path,
|
|
const gchar *menu_accel,
|
|
const gchar *help_domain,
|
|
const gchar *help_id,
|
|
const gchar *paint_core_name,
|
|
const gchar *stock_id);
|
|
|
|
void gimp_tool_info_set_standard (Gimp *gimp,
|
|
GimpToolInfo *tool_info);
|
|
GimpToolInfo * gimp_tool_info_get_standard (Gimp *gimp);
|
|
|
|
|
|
#endif /* __GIMP_TOOL_INFO_H__ */
|