[gimp] Use GIMP_IMAGE_ACTIVE_PARENT instead of a NULL parent in all obvious places
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Use GIMP_IMAGE_ACTIVE_PARENT instead of a NULL parent in all obvious places
- Date: Mon, 3 Aug 2009 20:31:08 +0000 (UTC)
commit a53d4566daff865c5e05f335d3366716e3e9b5f0
Author: Michael Natterer <mitch gimp org>
Date: Mon Aug 3 22:30:36 2009 +0200
Use GIMP_IMAGE_ACTIVE_PARENT instead of a NULL parent in all obvious places
app/actions/channels-commands.c | 14 ++++++++------
app/actions/edit-commands.c | 9 +++++----
app/actions/layers-commands.c | 27 +++++++++++++++------------
app/actions/vectors-commands.c | 23 +++++++++++++----------
app/core/gimpselection.c | 4 ++--
app/dialogs/file-open-dialog.c | 4 ++--
app/display/gimpdisplayshell-dnd.c | 25 +++++++++++++------------
app/tools/gimptexttool.c | 12 ++++++------
app/tools/gimpvectortool.c | 4 ++--
app/widgets/gimpchanneltreeview.c | 4 ++--
app/widgets/gimplayertreeview.c | 4 ++--
app/widgets/gimpvectorstreeview.c | 4 ++--
12 files changed, 72 insertions(+), 62 deletions(-)
---
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index d4d6854..3580775 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -166,8 +166,8 @@ channels_new_last_vals_cmd_callback (GtkAction *action,
action_data_get_context (data),
GIMP_TRANSPARENT_FILL);
- /* FIXME tree */
- gimp_image_add_channel (image, new_channel, NULL, -1, TRUE);
+ gimp_image_add_channel (image, new_channel,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
@@ -263,8 +263,9 @@ channels_duplicate_cmd_callback (GtkAction *action,
G_TYPE_FROM_INSTANCE (channel)));
}
- /* FIXME tree */
- gimp_image_add_channel (image, new_channel, NULL, -1, TRUE);
+ gimp_image_add_channel (image, new_channel,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
gimp_image_flush (image);
}
@@ -358,8 +359,9 @@ channels_new_channel_response (GtkWidget *widget,
GIMP_TRANSPARENT_FILL);
}
- /* FIXME tree */
- gimp_image_add_channel (options->image, new_channel, NULL, -1, TRUE);
+ gimp_image_add_channel (options->image, new_channel,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
gimp_image_flush (options->image);
}
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 50f3464..1ac978f 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -348,8 +348,8 @@ edit_paste_as_new_layer_cmd_callback (GtkAction *action,
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
g_object_unref (buffer);
- /* FIXME tree */
- gimp_image_add_layer (image, layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -496,9 +496,10 @@ edit_paste (GimpDisplay *display,
if (svg)
{
- /* FIXME tree */
if (gimp_vectors_import_buffer (display->image, svg, svg_size,
- TRUE, TRUE, NULL, -1, NULL, NULL))
+ TRUE, TRUE,
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
+ NULL, NULL))
{
gimp_image_flush (display->image);
}
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index bb6caa7..674a6a6 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -329,8 +329,8 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
layer_fill_type);
gimp_item_translate (GIMP_ITEM (new_layer), off_x, off_y, FALSE);
- /* FIXME tree */
- gimp_image_add_layer (image, new_layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
@@ -353,8 +353,9 @@ layers_new_from_visible_cmd_callback (GtkAction *action,
gimp_image_base_type_with_alpha (image),
_("Visible"),
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
- /* FIXME tree */
- gimp_image_add_layer (image, layer, NULL, -1, TRUE);
+
+ gimp_image_add_layer (image, layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -447,8 +448,9 @@ layers_duplicate_cmd_callback (GtkAction *action,
new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (layer),
G_TYPE_FROM_INSTANCE (layer)));
- /* FIXME tree */
- gimp_image_add_layer (image, new_layer, NULL, -1, TRUE);
+
+ gimp_image_add_layer (image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -523,8 +525,8 @@ layers_text_to_vectors_cmd_callback (GtkAction *action,
gimp_item_get_offset (GIMP_ITEM (layer), &x, &y);
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
- /* FIXME tree */
- gimp_image_add_vectors (image, vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (image, vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -551,8 +553,8 @@ layers_text_along_vectors_cmd_callback (GtkAction *action,
gimp_item_set_visible (GIMP_ITEM (new_vectors), TRUE, FALSE);
- /* FIXME tree */
- gimp_image_add_vectors (image, new_vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -968,8 +970,9 @@ layers_new_layer_response (GtkWidget *widget,
gimp_drawable_fill_by_type (GIMP_DRAWABLE (layer),
dialog->context,
layer_fill_type);
- /* FIXME tree */
- gimp_image_add_layer (dialog->image, layer, NULL, -1, TRUE);
+
+ gimp_image_add_layer (dialog->image, layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (dialog->image);
}
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 636c3f9..1f340b8 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -187,8 +187,8 @@ vectors_new_last_vals_cmd_callback (GtkAction *action,
new_vectors = gimp_vectors_new (image,
vectors_name ? vectors_name : _("New Path"));
- /* FIXME tree */
- gimp_image_add_vectors (image, new_vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (image);
}
@@ -252,8 +252,10 @@ vectors_duplicate_cmd_callback (GtkAction *action,
new_vectors = GIMP_VECTORS (gimp_item_duplicate (GIMP_ITEM (vectors),
G_TYPE_FROM_INSTANCE (vectors)));
- /* FIXME tree */
- gimp_image_add_vectors (image, new_vectors, NULL, -1, TRUE);
+
+ gimp_image_add_vectors (image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
+
gimp_image_flush (image);
}
@@ -478,9 +480,10 @@ vectors_paste_cmd_callback (GtkAction *action,
{
GError *error = NULL;
- /* FIXME tree */
if (! gimp_vectors_import_buffer (image, svg, svg_size,
- TRUE, TRUE, NULL, -1, NULL, &error))
+ TRUE, TRUE,
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
+ NULL, &error))
{
gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
"%s", error->message);
@@ -625,8 +628,8 @@ vectors_new_vectors_response (GtkWidget *widget,
new_vectors = gimp_vectors_new (options->image, vectors_name);
- /* FIXME tree */
- gimp_image_add_vectors (options->image, new_vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (options->image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (options->image);
}
@@ -672,10 +675,10 @@ vectors_import_response (GtkWidget *widget,
filename = gtk_file_chooser_get_filename (chooser);
- /* FIXME tree */
if (gimp_vectors_import_file (dialog->image, filename,
vectors_import_merge, vectors_import_scale,
- NULL, -1, NULL, &error))
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
+ NULL, &error))
{
gimp_image_flush (dialog->image);
}
diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c
index 07009b0..53bcb9c 100644
--- a/app/core/gimpselection.c
+++ b/app/core/gimpselection.c
@@ -615,8 +615,8 @@ gimp_selection_save (GimpSelection *selection)
/* saved selections are not visible by default */
gimp_item_set_visible (GIMP_ITEM (new_channel), FALSE, FALSE);
- /* FIXME tree */
- gimp_image_add_channel (image, new_channel, NULL, -1, TRUE);
+ gimp_image_add_channel (image, new_channel,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
return new_channel;
}
diff --git a/app/dialogs/file-open-dialog.c b/app/dialogs/file-open-dialog.c
index 5e7852e..9d52179 100644
--- a/app/dialogs/file-open-dialog.c
+++ b/app/dialogs/file-open-dialog.c
@@ -247,8 +247,8 @@ file_open_dialog_open_layers (GtkWidget *open_dialog,
if (new_layers)
{
- /* FIXME tree */
- gimp_image_add_layers (image, new_layers, NULL, -1,
+ gimp_image_add_layers (image, new_layers,
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
0, 0,
gimp_image_get_width (image),
gimp_image_get_height (image),
diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c
index 247158c..917243a 100644
--- a/app/display/gimpdisplayshell-dnd.c
+++ b/app/display/gimpdisplayshell-dnd.c
@@ -260,8 +260,8 @@ gimp_display_shell_drop_drawable (GtkWidget *widget,
gimp_item_set_visible (new_item, TRUE, FALSE);
gimp_item_set_linked (new_item, FALSE, FALSE);
- /* FIXME tree */
- gimp_image_add_layer (image, new_layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
@@ -301,8 +301,8 @@ gimp_display_shell_drop_vectors (GtkWidget *widget,
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
_("Drop New Path"));
- /* FIXME tree */
- gimp_image_add_vectors (image, new_vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
@@ -330,10 +330,11 @@ gimp_display_shell_drop_svg (GtkWidget *widget,
if (! image)
return;
- /* FIXME tree */
if (! gimp_vectors_import_buffer (image,
(const gchar *) svg_data, svg_data_len,
- TRUE, TRUE, NULL, -1, NULL, &error))
+ TRUE, TRUE,
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
+ NULL, &error))
{
gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
GIMP_MESSAGE_ERROR,
@@ -495,8 +496,8 @@ gimp_display_shell_drop_uri_list (GtkWidget *widget,
gimp_display_shell_untransform_viewport (shell, &x, &y,
&width, &height);
- /* FIXME tree */
- gimp_image_add_layers (image, new_layers, NULL, -1,
+ gimp_image_add_layers (image, new_layers,
+ GIMP_IMAGE_ACTIVE_PARENT, -1,
x, y, width, height,
_("Drop layers"));
@@ -592,8 +593,8 @@ gimp_display_shell_drop_component (GtkWidget *widget,
gimp_display_shell_dnd_position_item (shell, new_item);
- /* FIXME tree */
- gimp_image_add_layer (dest_image, new_layer, NULL, -1, TRUE);
+ gimp_image_add_layer (dest_image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (dest_image);
@@ -665,8 +666,8 @@ gimp_display_shell_drop_pixbuf (GtkWidget *widget,
if (! new_image)
gimp_display_shell_dnd_position_item (shell, new_item);
- /* FIXME tree */
- gimp_image_add_layer (image, new_layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index d12a6b0..95975d8 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -2173,8 +2173,8 @@ gimp_text_tool_create_layer (GimpTextTool *text_tool,
gimp_item_set_offset (GIMP_ITEM (layer), x1, y1);
- /* FIXME tree */
- gimp_image_add_layer (image, layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
if (text_tool->text_box_fixed)
{
@@ -2791,8 +2791,8 @@ gimp_text_tool_create_vectors (GimpTextTool *text_tool)
gimp_item_translate (GIMP_ITEM (vectors), x, y, FALSE);
}
- /* FIXME tree */
- gimp_image_add_vectors (text_tool->image, vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (text_tool->image, vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (text_tool->image);
}
@@ -2819,8 +2819,8 @@ gimp_text_tool_create_vectors_warped (GimpTextTool *text_tool)
gimp_vectors_warp_vectors (vectors0, vectors, 0.5 * box_height);
- /* FIXME tree */
- gimp_image_add_vectors (text_tool->image, vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (text_tool->image, vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_item_set_visible (GIMP_ITEM (vectors), TRUE, FALSE);
gimp_image_flush (text_tool->image);
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
index 77b6ea6..dcfb715 100644
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@@ -305,8 +305,8 @@ gimp_vector_tool_button_press (GimpTool *tool,
vector_tool->undo_motion = TRUE;
- /* FIXME tree */
- gimp_image_add_vectors (display->image, vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (display->image, vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_flush (display->image);
gimp_vector_tool_set_vectors (vector_tool, vectors);
diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c
index b469a32..43beabc 100644
--- a/app/widgets/gimpchanneltreeview.c
+++ b/app/widgets/gimpchanneltreeview.c
@@ -344,8 +344,8 @@ gimp_channel_tree_view_item_new (GimpImage *image)
gimp_image_get_height (image),
_("Empty Channel"), &color);
- /* FIXME tree */
- gimp_image_add_channel (image, new_channel, NULL, -1, TRUE);
+ gimp_image_add_channel (image, new_channel,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index d3e7693..7fb8868 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -863,8 +863,8 @@ gimp_layer_tree_view_item_new (GimpImage *image)
gimp_image_base_type_with_alpha (image),
_("Empty Layer"), 1.0, GIMP_NORMAL_MODE);
- /* FIXME tree */
- gimp_image_add_layer (image, new_layer, NULL, -1, TRUE);
+ gimp_image_add_layer (image, new_layer,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
gimp_image_undo_group_end (image);
diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c
index 4e0c248..4f36223 100644
--- a/app/widgets/gimpvectorstreeview.c
+++ b/app/widgets/gimpvectorstreeview.c
@@ -259,8 +259,8 @@ gimp_vectors_tree_view_item_new (GimpImage *image)
new_vectors = gimp_vectors_new (image, _("Empty Path"));
- /* FIXME tree */
- gimp_image_add_vectors (image, new_vectors, NULL, -1, TRUE);
+ gimp_image_add_vectors (image, new_vectors,
+ GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
return GIMP_ITEM (new_vectors);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
