gimp/app/core/gimppaintinfo.c
Michael Natterer ef9b04c535 Fixed incomplete core/ui separation of paint tools and paint methods:
2005-12-27  Michael Natterer  <mitch@gimp.org>

	Fixed incomplete core/ui separation of paint tools and paint
	methods:

	* app/core/core-enums.h
	* app/core/gimpcontext.[ch]: added a "paint-info" property and API
	so the current paint method can be selected without the need for
	an active tool.

	(gimp_context_real_set_tool): set the paint-info to
	tool_info->paint_info so the paint method follows the active tool
	just as the active image follows the active display.

	* app/core/gimp.h (struct Gimp)
	* app/core/gimppaintinfo.[ch]: added "standard_paint_info" API
	and stuff to be consistent with other context object properties.

	* app/paint/gimp-paint.c: set the paintbrush as
	standard_paint_info.

	* app/core/gimpstrokedesc.c (gimp_stroke_desc_new): removed the
	hack of falling back to the paintbrush when there is no active
	tool and use the active paint method instead. Fall back to the
	standard paint method if there is no active one.
	(nothing in the core uses the active tool any more now).

	* app/widgets/gimpdeviceinfo.h: add the paint info to the
	properties which are saved in devicerc.

	Added identifiers (names) and stock-ids to GimpPaintInfo:

	* app/core/gimppaintinfo.[ch] (gimp_paint_info_new): added
	identifier and stock-id parameters.

	* app/core/gimptoolinfo.c (gimp_tool_info_new): removed the hack
	of setting the paint-info stock-id from the tool-info stock-id.

	* app/paint/paint-types.h
	* app/paint/gimp-paint.c: changed GimpPaintRegisterCallback
	accordingly.

	* app/tools/gimp-tools.c (gimp_tools_register): changed paint
	info names accordingly.

	* app/paint/*.c (gimp_*_register): pass identifier and stock-id
	accordingly.
2005-12-27 18:57:01 +00:00

146 lines
4.1 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 "paint/gimppaintoptions.h"
#include "gimp.h"
#include "gimppaintinfo.h"
static void gimp_paint_info_finalize (GObject *object);
static gchar * gimp_paint_info_get_description (GimpViewable *viewable,
gchar **tooltip);
G_DEFINE_TYPE (GimpPaintInfo, gimp_paint_info, GIMP_TYPE_VIEWABLE);
#define parent_class gimp_paint_info_parent_class
static void
gimp_paint_info_class_init (GimpPaintInfoClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
object_class->finalize = gimp_paint_info_finalize;
viewable_class->get_description = gimp_paint_info_get_description;
}
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 = 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);
}
static gchar *
gimp_paint_info_get_description (GimpViewable *viewable,
gchar **tooltip)
{
GimpPaintInfo *paint_info = GIMP_PAINT_INFO (viewable);
return g_strdup (paint_info->blurb);
}
GimpPaintInfo *
gimp_paint_info_new (Gimp *gimp,
GType paint_type,
GType paint_options_type,
const gchar *identifier,
const gchar *blurb,
const gchar *stock_id)
{
GimpPaintInfo *paint_info;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (identifier != NULL, NULL);
g_return_val_if_fail (blurb != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
paint_info = g_object_new (GIMP_TYPE_PAINT_INFO,
"name", identifier,
"stock-id", stock_id,
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 = gimp_paint_options_new (paint_info);
return paint_info;
}
void
gimp_paint_info_set_standard (Gimp *gimp,
GimpPaintInfo *paint_info)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (! paint_info || GIMP_IS_PAINT_INFO (paint_info));
if (paint_info != gimp->standard_paint_info)
{
if (gimp->standard_paint_info)
g_object_unref (gimp->standard_paint_info);
gimp->standard_paint_info = paint_info;
if (gimp->standard_paint_info)
g_object_ref (gimp->standard_paint_info);
}
}
GimpPaintInfo *
gimp_paint_info_get_standard (Gimp *gimp)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
return gimp->standard_paint_info;
}