dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

made "tool-info" a G_PARAM_CONSTRUCT_ONLY property. 

2003-08-30  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimptool.c: made "tool-info" a G_PARAM_CONSTRUCT_ONLY
	property.

	* app/tools/tool_manager.c (tool_manager_tool_changed): pass it to
	g_object_new() instead of setting it after tool creation.

	* app/tools/gimppainttool.[ch]
	* app/tools/gimptransformtool.[ch]: removed ugly
	"gboolean notify_connected" hacks and connect to the signals in
	GObject::constructor().

	* app/tools/gimppainttool.c (gimp_paint_tool_contstructor): create
	paint_tool->core here from tool->tool_info->paint_info->paint_type.

	* app/tools/gimpairbrushtool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpdodgeburntool.c
	* app/tools/gimperasertool.c
	* app/tools/gimppaintbrushtool.c
	* app/tools/gimppenciltool.c
	* app/tools/gimpsmudgetool.c: changed accordingly. Removed lots of
	useless class_init functions. Converted tabs to spaces. Cleanup.
This commit is contained in:
Michael Natterer 2003-08-30 16:41:35 +00:00 committed by Michael Natterer
parent 2da93d692f
commit c049f82e59
18 changed files with 396 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2003-08-30 Michael Natterer <mitch@gimp.org>
* app/tools/gimptool.c: made "tool-info" a G_PARAM_CONSTRUCT_ONLY
property.
* app/tools/tool_manager.c (tool_manager_tool_changed): pass it to
g_object_new() instead of setting it after tool creation.
* app/tools/gimppainttool.[ch]
* app/tools/gimptransformtool.[ch]: removed ugly
"gboolean notify_connected" hacks and connect to the signals in
GObject::constructor().
* app/tools/gimppainttool.c (gimp_paint_tool_contstructor): create
paint_tool->core here from tool->tool_info->paint_info->paint_type.
* app/tools/gimpairbrushtool.c
* app/tools/gimpclonetool.c
* app/tools/gimpconvolvetool.c
* app/tools/gimpdodgeburntool.c
* app/tools/gimperasertool.c
* app/tools/gimppaintbrushtool.c
* app/tools/gimppenciltool.c
* app/tools/gimpsmudgetool.c: changed accordingly. Removed lots of
useless class_init functions. Converted tabs to spaces. Cleanup.
2003-08-30 Michael Natterer <mitch@gimp.org>
* app/core/gimpchannel.[ch] (gimp_channel_boundary)

37
app/tools/gimpairbrushtool.c
View File

@ -26,7 +26,6 @@
#include "core/gimptoolinfo.h"
#include "paint/gimpairbrush.h"
#include "paint/gimpairbrushoptions.h"
#include "widgets/gimphelp-ids.h"
@ -39,13 +38,8 @@
#include "gimp-intl.h"
static void gimp_airbrush_tool_class_init (GimpAirbrushToolClass *klass);
static void gimp_airbrush_tool_init (GimpAirbrushTool *airbrush);
static GtkWidget * gimp_airbrush_options_gui (GimpToolOptions *tool_options);
static GimpPaintbrushToolClass *parent_class = NULL;
static void gimp_airbrush_tool_init (GimpAirbrushTool *airbrush);
static GtkWidget * gimp_airbrush_options_gui (GimpToolOptions *tool_options);
/* functions */
@ -77,14 +71,14 @@ gimp_airbrush_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpAirbrushToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_airbrush_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpAirbrushTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_airbrush_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
NULL, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpAirbrushTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_airbrush_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINTBRUSH_TOOL,
@ -95,16 +89,6 @@ gimp_airbrush_tool_get_type (void)
return tool_type;
}
static void
gimp_airbrush_tool_class_init (GimpAirbrushToolClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
}
static void
gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
{
@ -117,7 +101,6 @@ gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
gimp_tool_control_set_tool_cursor (tool->control, GIMP_AIRBRUSH_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_AIRBRUSH, NULL);
}

60
app/tools/gimpbrushtool.c
View File

@ -39,6 +39,7 @@
#include "core/gimpbrush.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimppaintinfo.h"
#include "core/gimptoolinfo.h"
#include "paint/gimppaintcore.h"
@ -66,6 +67,9 @@
static void gimp_paint_tool_class_init (GimpPaintToolClass *klass);
static void gimp_paint_tool_init (GimpPaintTool *paint_tool);
static GObject * gimp_paint_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_paint_tool_finalize (GObject *object);
static void gimp_paint_tool_control (GimpTool *tool,
@ -161,6 +165,7 @@ gimp_paint_tool_class_init (GimpPaintToolClass *klass)
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gimp_paint_tool_constructor;
object_class->finalize = gimp_paint_tool_finalize;
tool_class->control = gimp_paint_tool_control;
@ -184,16 +189,44 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool)
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
paint_tool->pick_colors = FALSE;
paint_tool->draw_line = FALSE;
paint_tool->pick_colors = FALSE;
paint_tool->draw_line = FALSE;
paint_tool->notify_connected = FALSE;
paint_tool->draw_brush = TRUE;
paint_tool->draw_brush = TRUE;
paint_tool->brush_x = 0.0;
paint_tool->brush_y = 0.0;
paint_tool->brush_x = 0.0;
paint_tool->brush_y = 0.0;
paint_tool->core = NULL;
}
paint_tool->core = NULL;
static GObject *
gimp_paint_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpTool *tool;
GimpPaintTool *paint_tool;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
tool = GIMP_TOOL (object);
paint_tool = GIMP_PAINT_TOOL (object);
g_assert (GIMP_IS_TOOL_INFO (tool->tool_info));
paint_tool->draw_brush =
GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config)->show_brush_outline;
g_signal_connect_object (tool->tool_info->gimp->config,
"notify::show-brush-outline",
G_CALLBACK (gimp_paint_tool_notify_brush),
paint_tool, 0);
paint_tool->core = g_object_new (tool->tool_info->paint_info->paint_type,
NULL);
return object;
}
static void
@ -570,19 +603,6 @@ gimp_paint_tool_oper_update (GimpTool *tool,
return;
}
if (! paint_tool->notify_connected)
{
paint_tool->draw_brush =
GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config)->show_brush_outline;
g_signal_connect_object (tool->tool_info->gimp->config,
"notify::show-brush-outline",
G_CALLBACK (gimp_paint_tool_notify_brush),
paint_tool, 0);
paint_tool->notify_connected = TRUE;
}
core = paint_tool->core;
shell = GIMP_DISPLAY_SHELL (gdisp->shell);

2
app/tools/gimpbrushtool.h
View File

@ -40,9 +40,7 @@ struct _GimpPaintTool
gboolean pick_colors; /* pick color if ctrl is pressed */
gboolean draw_line;
gboolean notify_connected;
gboolean draw_brush;
gdouble brush_x;
gdouble brush_y;

99
app/tools/gimpclonetool.c
View File

@ -51,6 +51,9 @@
static void gimp_clone_tool_class_init (GimpCloneToolClass *klass);
static void gimp_clone_tool_init (GimpCloneTool *tool);
static GObject * gimp_clone_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_clone_tool_button_press (GimpTool *tool,
GimpCoords *coords,
guint32 time,
@ -114,18 +117,18 @@ gimp_clone_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpCloneToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_clone_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpCloneTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_clone_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_clone_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpCloneTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_clone_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpCloneTool",
"GimpCloneTool",
&tool_info, 0);
}
@ -137,14 +140,18 @@ gimp_clone_tool_get_type (void)
static void
gimp_clone_tool_class_init (GimpCloneToolClass *klass)
{
GObjectClass *object_class;
GimpToolClass *tool_class;
GimpDrawToolClass *draw_tool_class;
object_class = G_OBJECT_CLASS (klass);
tool_class = GIMP_TOOL_CLASS (klass);
draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gimp_clone_tool_constructor;
tool_class->button_press = gimp_clone_tool_button_press;
tool_class->motion = gimp_clone_tool_motion;
tool_class->cursor_update = gimp_clone_tool_cursor_update;
@ -157,22 +164,35 @@ gimp_clone_tool_init (GimpCloneTool *clone)
{
GimpTool *tool;
GimpPaintTool *paint_tool;
GimpClone *clone_core;
tool = GIMP_TOOL (clone);
paint_tool = GIMP_PAINT_TOOL (clone);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_CLONE_TOOL_CURSOR);
}
clone_core = g_object_new (GIMP_TYPE_CLONE, NULL);
static GObject *
gimp_clone_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpPaintTool *paint_tool;
GimpClone *clone_core;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
paint_tool = GIMP_PAINT_TOOL (object);
clone_core = GIMP_CLONE (paint_tool->core);
clone_core->init_callback = gimp_clone_init_callback;
clone_core->finish_callback = gimp_clone_finish_callback;
clone_core->pretrace_callback = gimp_clone_pretrace_callback;
clone_core->posttrace_callback = gimp_clone_posttrace_callback;
clone_core->callback_data = clone;
clone_core->callback_data = object;
paint_tool->core = GIMP_PAINT_CORE (clone_core);
return object;
}
static void
@ -187,18 +207,11 @@ gimp_clone_tool_button_press (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK)
{
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
}
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else
{
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
}
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
GIMP_TOOL_CLASS (parent_class)->button_press (tool,
coords,
time,
state,
GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
gdisp);
}
@ -214,19 +227,11 @@ gimp_clone_tool_motion (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK)
{
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
}
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else
{
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
}
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
GIMP_TOOL_CLASS (parent_class)->motion (tool,
coords,
time,
state,
gdisp);
GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, gdisp);
}
void
@ -311,45 +316,29 @@ static void
gimp_clone_init_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_start (GIMP_DRAW_TOOL (clone_tool),
GIMP_TOOL (clone_tool)->gdisp);
gimp_draw_tool_start (GIMP_DRAW_TOOL (data),
GIMP_TOOL (data)->gdisp);
}
static void
gimp_clone_finish_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_stop (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_stop (GIMP_DRAW_TOOL (data));
}
static void
gimp_clone_pretrace_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_pause (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_pause (GIMP_DRAW_TOOL (data));
}
static void
gimp_clone_posttrace_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_resume (GIMP_DRAW_TOOL (data));
}

30
app/tools/gimpconvolvetool.c
View File

@ -37,7 +37,6 @@
#include "core/gimpimage.h"
#include "core/gimptoolinfo.h"
#include "paint/gimpconvolve.h"
#include "paint/gimpconvolveoptions.h"
#include "widgets/gimphelp-ids.h"
@ -51,11 +50,11 @@
#include "gimp-intl.h"
#define FIELD_COLS 4
#define FIELD_COLS 4
#define MIN_BLUR 64 /* (8/9 original pixel) */
#define MAX_BLUR 0.25 /* (1/33 original pixel) */
#define MIN_SHARPEN -512
#define MAX_SHARPEN -64
#define MAX_BLUR 0.25 /* (1/33 original pixel) */
#define MIN_SHARPEN -512
#define MAX_SHARPEN -64
static void gimp_convolve_tool_class_init (GimpConvolveToolClass *klass);
@ -106,18 +105,18 @@ gimp_convolve_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpConvolveToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_convolve_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpConvolveTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_convolve_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_convolve_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpConvolveTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_convolve_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpConvolveTool",
"GimpConvolveTool",
&tool_info, 0);
}
@ -154,9 +153,6 @@ gimp_convolve_tool_init (GimpConvolveTool *convolve)
GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_CONVOLVE, NULL);
}
static void

25
app/tools/gimpdodgeburntool.c
View File

@ -26,7 +26,6 @@
#include "core/gimptoolinfo.h"
#include "paint/gimpdodgeburn.h"
#include "paint/gimpdodgeburnoptions.h"
#include "widgets/gimphelp-ids.h"
@ -86,18 +85,18 @@ gimp_dodgeburn_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpDodgeBurnToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_dodgeburn_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpDodgeBurnTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_dodgeburn_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_dodgeburn_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpDodgeBurnTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_dodgeburn_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpDodgeBurnTool",
"GimpDodgeBurnTool",
&tool_info, 0);
}
@ -130,8 +129,6 @@ gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn)
GIMP_DODGE_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control,
GIMP_BURN_TOOL_CURSOR);
paint_tool->core = g_object_new (GIMP_TYPE_DODGE_BURN, NULL);
}
static void
@ -163,8 +160,7 @@ gimp_dodgeburn_tool_modifier_key (GimpTool *tool,
}
}
GIMP_TOOL_CLASS (parent_class)->modifier_key (tool,
key, press, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state, gdisp);
}
static void
@ -177,7 +173,6 @@ gimp_dodgeburn_tool_cursor_update (GimpTool *tool,
options = GIMP_DODGE_BURN_OPTIONS (tool->tool_info->tool_options);
gimp_tool_control_set_toggle (tool->control, (options->type == GIMP_BURN));
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);

21
app/tools/gimperasertool.c
View File

@ -26,7 +26,6 @@
#include "core/gimptoolinfo.h"
#include "paint/gimperaser.h"
#include "paint/gimperaseroptions.h"
#include "widgets/gimphelp-ids.h"
@ -86,18 +85,18 @@ gimp_eraser_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpEraserToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_eraser_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpEraserTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_eraser_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_eraser_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpEraserTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_eraser_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpEraserTool",
"GimpEraserTool",
&tool_info, 0);
}
@ -132,8 +131,6 @@ gimp_eraser_tool_init (GimpEraserTool *eraser)
GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control,
GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_ERASER, NULL);
}
static void

36
app/tools/gimppaintbrushtool.c
View File

@ -24,7 +24,6 @@
#include "tools-types.h"
#include "paint/gimppaintbrush.h"
#include "paint/gimppaintoptions.h"
#include "widgets/gimphelp-ids.h"
@ -36,11 +35,7 @@
#include "gimp-intl.h"
static void gimp_paintbrush_tool_class_init (GimpPaintbrushToolClass *klass);
static void gimp_paintbrush_tool_init (GimpPaintbrushTool *tool);
static GimpPaintToolClass *parent_class = NULL;
static void gimp_paintbrush_tool_init (GimpPaintbrushTool *tool);
/* public functions */
@ -73,18 +68,18 @@ gimp_paintbrush_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpPaintbrushToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_paintbrush_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPaintbrushTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_paintbrush_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
NULL, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPaintbrushTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_paintbrush_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpPaintbrushTool",
"GimpPaintbrushTool",
&tool_info, 0);
}
@ -94,16 +89,6 @@ gimp_paintbrush_tool_get_type (void)
/* private functions */
static void
gimp_paintbrush_tool_class_init (GimpPaintbrushToolClass *klass)
{
GimpPaintToolClass *paint_tool_class;
paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
}
static void
gimp_paintbrush_tool_init (GimpPaintbrushTool *paintbrush)
{
@ -117,5 +102,4 @@ gimp_paintbrush_tool_init (GimpPaintbrushTool *paintbrush)
GIMP_PAINTBRUSH_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_PAINTBRUSH, NULL);
}

60
app/tools/gimppainttool.c
View File

@ -39,6 +39,7 @@
#include "core/gimpbrush.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimppaintinfo.h"
#include "core/gimptoolinfo.h"
#include "paint/gimppaintcore.h"
@ -66,6 +67,9 @@
static void gimp_paint_tool_class_init (GimpPaintToolClass *klass);
static void gimp_paint_tool_init (GimpPaintTool *paint_tool);
static GObject * gimp_paint_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_paint_tool_finalize (GObject *object);
static void gimp_paint_tool_control (GimpTool *tool,
@ -161,6 +165,7 @@ gimp_paint_tool_class_init (GimpPaintToolClass *klass)
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gimp_paint_tool_constructor;
object_class->finalize = gimp_paint_tool_finalize;
tool_class->control = gimp_paint_tool_control;
@ -184,16 +189,44 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool)
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
paint_tool->pick_colors = FALSE;
paint_tool->draw_line = FALSE;
paint_tool->pick_colors = FALSE;
paint_tool->draw_line = FALSE;
paint_tool->notify_connected = FALSE;
paint_tool->draw_brush = TRUE;
paint_tool->draw_brush = TRUE;
paint_tool->brush_x = 0.0;
paint_tool->brush_y = 0.0;
paint_tool->brush_x = 0.0;
paint_tool->brush_y = 0.0;
paint_tool->core = NULL;
}
paint_tool->core = NULL;
static GObject *
gimp_paint_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpTool *tool;
GimpPaintTool *paint_tool;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
tool = GIMP_TOOL (object);
paint_tool = GIMP_PAINT_TOOL (object);
g_assert (GIMP_IS_TOOL_INFO (tool->tool_info));
paint_tool->draw_brush =
GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config)->show_brush_outline;
g_signal_connect_object (tool->tool_info->gimp->config,
"notify::show-brush-outline",
G_CALLBACK (gimp_paint_tool_notify_brush),
paint_tool, 0);
paint_tool->core = g_object_new (tool->tool_info->paint_info->paint_type,
NULL);
return object;
}
static void
@ -570,19 +603,6 @@ gimp_paint_tool_oper_update (GimpTool *tool,
return;
}
if (! paint_tool->notify_connected)
{
paint_tool->draw_brush =
GIMP_DISPLAY_CONFIG (tool->tool_info->gimp->config)->show_brush_outline;
g_signal_connect_object (tool->tool_info->gimp->config,
"notify::show-brush-outline",
G_CALLBACK (gimp_paint_tool_notify_brush),
paint_tool, 0);
paint_tool->notify_connected = TRUE;
}
core = paint_tool->core;
shell = GIMP_DISPLAY_SHELL (gdisp->shell);

2
app/tools/gimppainttool.h
View File

@ -40,9 +40,7 @@ struct _GimpPaintTool
gboolean pick_colors; /* pick color if ctrl is pressed */
gboolean draw_line;
gboolean notify_connected;
gboolean draw_brush;
gdouble brush_x;
gdouble brush_y;

36
app/tools/gimppenciltool.c
View File

@ -24,7 +24,6 @@
#include "tools-types.h"
#include "paint/gimppencil.h"
#include "paint/gimppenciloptions.h"
#include "widgets/gimphelp-ids.h"
@ -36,11 +35,7 @@
#include "gimp-intl.h"
static void gimp_pencil_tool_class_init (GimpPencilToolClass *klass);
static void gimp_pencil_tool_init (GimpPencilTool *pancil);
static GimpPaintbrushToolClass *parent_class = NULL;
static void gimp_pencil_tool_init (GimpPencilTool *pencil);
/* functions */
@ -72,34 +67,24 @@ gimp_pencil_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpPencilToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_pencil_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPencilTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_pencil_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
NULL, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPencilTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_pencil_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINTBRUSH_TOOL,
"GimpPencilTool",
"GimpPencilTool",
&tool_info, 0);
}
return tool_type;
}
static void
gimp_pencil_tool_class_init (GimpPencilToolClass *klass)
{
GimpPaintToolClass *paint_tool_class;
paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
}
static void
gimp_pencil_tool_init (GimpPencilTool *pencil)
{
@ -113,5 +98,4 @@ gimp_pencil_tool_init (GimpPencilTool *pencil)
gimp_tool_control_set_tool_cursor (tool->control, GIMP_PENCIL_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_PENCIL, NULL);
}

39
app/tools/gimpsmudgetool.c
View File

@ -26,7 +26,6 @@
#include "core/gimptoolinfo.h"
#include "paint/gimpsmudge.h"
#include "paint/gimpsmudgeoptions.h"
#include "widgets/gimphelp-ids.h"
@ -39,13 +38,8 @@
#include "gimp-intl.h"
static void gimp_smudge_tool_class_init (GimpSmudgeToolClass *klass);
static void gimp_smudge_tool_init (GimpSmudgeTool *tool);
static GtkWidget * gimp_smudge_options_gui (GimpToolOptions *tool_options);
static GimpPaintToolClass *parent_class = NULL;
static void gimp_smudge_tool_init (GimpSmudgeTool *tool);
static GtkWidget * gimp_smudge_options_gui (GimpToolOptions *tool_options);
/* global functions */
@ -77,34 +71,24 @@ gimp_smudge_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpSmudgeToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_smudge_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpSmudgeTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_smudge_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
NULL, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpSmudgeTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_smudge_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpSmudgeTool",
"GimpSmudgeTool",
&tool_info, 0);
}
return tool_type;
}
static void
gimp_smudge_tool_class_init (GimpSmudgeToolClass *klass)
{
GimpPaintToolClass *paint_tool_class;
paint_tool_class = GIMP_PAINT_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
}
static void
gimp_smudge_tool_init (GimpSmudgeTool *smudge)
{
@ -117,7 +101,6 @@ gimp_smudge_tool_init (GimpSmudgeTool *smudge)
gimp_tool_control_set_tool_cursor (tool->control, GIMP_SMUDGE_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_SMUDGE, NULL);
}

99
app/tools/gimpsourcetool.c
View File

@ -51,6 +51,9 @@
static void gimp_clone_tool_class_init (GimpCloneToolClass *klass);
static void gimp_clone_tool_init (GimpCloneTool *tool);
static GObject * gimp_clone_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_clone_tool_button_press (GimpTool *tool,
GimpCoords *coords,
guint32 time,
@ -114,18 +117,18 @@ gimp_clone_tool_get_type (void)
static const GTypeInfo tool_info =
{
sizeof (GimpCloneToolClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_clone_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpCloneTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_clone_tool_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_clone_tool_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpCloneTool),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_clone_tool_init,
};
tool_type = g_type_register_static (GIMP_TYPE_PAINT_TOOL,
"GimpCloneTool",
"GimpCloneTool",
&tool_info, 0);
}
@ -137,14 +140,18 @@ gimp_clone_tool_get_type (void)
static void
gimp_clone_tool_class_init (GimpCloneToolClass *klass)
{
GObjectClass *object_class;
GimpToolClass *tool_class;
GimpDrawToolClass *draw_tool_class;
object_class = G_OBJECT_CLASS (klass);
tool_class = GIMP_TOOL_CLASS (klass);
draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gimp_clone_tool_constructor;
tool_class->button_press = gimp_clone_tool_button_press;
tool_class->motion = gimp_clone_tool_motion;
tool_class->cursor_update = gimp_clone_tool_cursor_update;
@ -157,22 +164,35 @@ gimp_clone_tool_init (GimpCloneTool *clone)
{
GimpTool *tool;
GimpPaintTool *paint_tool;
GimpClone *clone_core;
tool = GIMP_TOOL (clone);
paint_tool = GIMP_PAINT_TOOL (clone);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_CLONE_TOOL_CURSOR);
}
clone_core = g_object_new (GIMP_TYPE_CLONE, NULL);
static GObject *
gimp_clone_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpPaintTool *paint_tool;
GimpClone *clone_core;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
paint_tool = GIMP_PAINT_TOOL (object);
clone_core = GIMP_CLONE (paint_tool->core);
clone_core->init_callback = gimp_clone_init_callback;
clone_core->finish_callback = gimp_clone_finish_callback;
clone_core->pretrace_callback = gimp_clone_pretrace_callback;
clone_core->posttrace_callback = gimp_clone_posttrace_callback;
clone_core->callback_data = clone;
clone_core->callback_data = object;
paint_tool->core = GIMP_PAINT_CORE (clone_core);
return object;
}
static void
@ -187,18 +207,11 @@ gimp_clone_tool_button_press (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK)
{
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
}
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else
{
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
}
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
GIMP_TOOL_CLASS (parent_class)->button_press (tool,
coords,
time,
state,
GIMP_TOOL_CLASS (parent_class)->button_press (tool, coords, time, state,
gdisp);
}
@ -214,19 +227,11 @@ gimp_clone_tool_motion (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK)
{
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
}
GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else
{
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
}
GIMP_CLONE (paint_tool->core)->set_source = FALSE;
GIMP_TOOL_CLASS (parent_class)->motion (tool,
coords,
time,
state,
gdisp);
GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, gdisp);
}
void
@ -311,45 +316,29 @@ static void
gimp_clone_init_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_start (GIMP_DRAW_TOOL (clone_tool),
GIMP_TOOL (clone_tool)->gdisp);
gimp_draw_tool_start (GIMP_DRAW_TOOL (data),
GIMP_TOOL (data)->gdisp);
}
static void
gimp_clone_finish_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_stop (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_stop (GIMP_DRAW_TOOL (data));
}
static void
gimp_clone_pretrace_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_pause (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_pause (GIMP_DRAW_TOOL (data));
}
static void
gimp_clone_posttrace_callback (GimpClone *clone,
gpointer data)
{
GimpCloneTool *clone_tool;
clone_tool = GIMP_CLONE_TOOL (data);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (clone_tool));
gimp_draw_tool_resume (GIMP_DRAW_TOOL (data));
}

79
app/tools/gimptool.c
View File

@ -23,6 +23,7 @@
#include "tools-types.h"
#include "core/gimpimage.h"
#include "core/gimptoolinfo.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
@ -33,9 +34,25 @@
#include "gimptoolcontrol.h"
enum
{
PROP_0,
PROP_TOOL_INFO
};
static void gimp_tool_class_init (GimpToolClass *klass);
static void gimp_tool_init (GimpTool *tool);
static void gimp_tool_finalize (GObject *object);
static void gimp_tool_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_tool_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_tool_real_initialize (GimpTool *tool,
GimpDisplay *gdisp);
@ -117,7 +134,9 @@ gimp_tool_class_init (GimpToolClass *klass)
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gimp_tool_finalize;
object_class->finalize = gimp_tool_finalize;
object_class->set_property = gimp_tool_set_property;
object_class->get_property = gimp_tool_get_property;
klass->initialize = gimp_tool_real_initialize;
klass->control = gimp_tool_real_control;
@ -128,6 +147,14 @@ gimp_tool_class_init (GimpToolClass *klass)
klass->modifier_key = gimp_tool_real_modifier_key;
klass->oper_update = gimp_tool_real_oper_update;
klass->cursor_update = gimp_tool_real_cursor_update;
g_object_class_install_property (object_class, PROP_TOOL_INFO,
g_param_spec_object ("tool-info",
NULL, NULL,
GIMP_TYPE_TOOL_INFO,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
}
static void
@ -145,6 +172,12 @@ gimp_tool_finalize (GObject *object)
{
GimpTool *tool = GIMP_TOOL (object);
if (tool->tool_info)
{
g_object_unref (tool->tool_info);
tool->tool_info = NULL;
}
if (tool->control)
{
g_object_unref (tool->control);
@ -154,6 +187,50 @@ gimp_tool_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gimp_tool_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GimpTool *tool;
tool = GIMP_TOOL (object);
switch (property_id)
{
case PROP_TOOL_INFO:
tool->tool_info = GIMP_TOOL_INFO (g_value_dup_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
gimp_tool_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpTool *tool;
tool = GIMP_TOOL (object);
switch (property_id)
{
case PROP_TOOL_INFO:
g_value_set_object (value, tool->tool_info);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
/* standard member functions */

76
app/tools/gimptransformtool.c
View File

@ -72,6 +72,9 @@
static void gimp_transform_tool_init (GimpTransformTool *tool);
static void gimp_transform_tool_class_init (GimpTransformToolClass *tool);
static GObject * gimp_transform_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_transform_tool_finalize (GObject *object);
static void gimp_transform_tool_initialize (GimpTool *tool,
@ -186,6 +189,7 @@ gimp_transform_tool_class_init (GimpTransformToolClass *klass)
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gimp_transform_tool_constructor;
object_class->finalize = gimp_transform_tool_finalize;
tool_class->initialize = gimp_transform_tool_initialize;
@ -235,7 +239,6 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
tr_tool->grid_coords = NULL;
tr_tool->tgrid_coords = NULL;
tr_tool->notify_connected = FALSE;
tr_tool->type = GIMP_TRANSFORM_TYPE_LAYER;
tr_tool->direction = GIMP_TRANSFORM_FORWARD;
@ -244,6 +247,50 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
tr_tool->info_dialog = NULL;
}
static GObject *
gimp_transform_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpTool *tool;
GimpTransformTool *tr_tool;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
tool = GIMP_TOOL (object);
tr_tool = GIMP_TRANSFORM_TOOL (object);
g_assert (GIMP_IS_TOOL_INFO (tool->tool_info));
if (tr_tool->use_grid)
{
tr_tool->type =
GIMP_TRANSFORM_OPTIONS (tool->tool_info->tool_options)->type;
tr_tool->direction =
GIMP_TRANSFORM_OPTIONS (tool->tool_info->tool_options)->direction;
g_signal_connect_object (tool->tool_info->tool_options,
"notify::type",
G_CALLBACK (gimp_transform_tool_notify_type),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::direction",
G_CALLBACK (gimp_transform_tool_notify_type),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::grid-type",
G_CALLBACK (gimp_transform_tool_notify_grid),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::grid-size",
G_CALLBACK (gimp_transform_tool_notify_grid),
tr_tool, 0);
}
return object;
}
static void
gimp_transform_tool_finalize (GObject *object)
{
@ -316,33 +363,6 @@ gimp_transform_tool_initialize (GimpTool *tool,
/* Recalculate the transform tool */
gimp_transform_tool_recalc (tr_tool, gdisp);
if (tr_tool->use_grid && ! tr_tool->notify_connected)
{
tr_tool->type =
GIMP_TRANSFORM_OPTIONS (tool->tool_info->tool_options)->type;
tr_tool->direction =
GIMP_TRANSFORM_OPTIONS (tool->tool_info->tool_options)->direction;
g_signal_connect_object (tool->tool_info->tool_options,
"notify::type",
G_CALLBACK (gimp_transform_tool_notify_type),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::direction",
G_CALLBACK (gimp_transform_tool_notify_type),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::grid-type",
G_CALLBACK (gimp_transform_tool_notify_grid),
tr_tool, 0);
g_signal_connect_object (tool->tool_info->tool_options,
"notify::grid-size",
G_CALLBACK (gimp_transform_tool_notify_grid),
tr_tool, 0);
tr_tool->notify_connected = TRUE;
}
/* start drawing the bounding box and handles... */
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);

1
app/tools/gimptransformtool.h
View File

@ -89,7 +89,6 @@ struct _GimpTransformTool
*/
gdouble *tgrid_coords; /* transformed grid_coords */
gboolean notify_connected;
GimpTransformType type;
GimpTransformDirection direction;

6
app/tools/tool_manager.c
View File

@ -686,9 +686,9 @@ tool_manager_tool_changed (GimpContext *user_context,
if (g_type_is_a (tool_info->tool_type, GIMP_TYPE_TOOL))
{
new_tool = g_object_new (tool_info->tool_type, NULL);
new_tool->tool_info = tool_info;
new_tool = g_object_new (tool_info->tool_type,
"tool-info", tool_info,
NULL);
}
else
{