gimp r27649 - in trunk: . app/actions app/core app/display app/pdb app/tools app/widgets app/xcf tools/pdbgen/pdb
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27649 - in trunk: . app/actions app/core app/display app/pdb app/tools app/widgets app/xcf tools/pdbgen/pdb
- Date: Fri, 14 Nov 2008 15:01:45 +0000 (UTC)
Author: mitch
Date: Fri Nov 14 15:01:44 2008
New Revision: 27649
URL: http://svn.gnome.org/viewvc/gimp?rev=27649&view=rev
Log:
2008-11-14 Michael Natterer <mitch gimp org>
* app/core/gimpimage.[ch]: rename gimp_image_floating_sel() to
gimp_image_get_floating_selection().
* app/actions/channels-actions.c
* app/actions/image-actions.c
* app/actions/layers-actions.c
* app/actions/layers-commands.c
* app/actions/select-actions.c
* app/core/gimpdrawable.c
* app/core/gimpimage-duplicate.c
* app/core/gimpimage-merge.c
* app/core/gimpimage-quick-mask.c
* app/core/gimplayer-floating-sel.c
* app/core/gimpselection.c
* app/display/gimpdisplayshell-layer-select.c
* app/display/gimpdisplayshell.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpmovetool.c
* app/tools/gimprectangleselecttool.c
* app/tools/gimpregionselecttool.c
* app/tools/gimpselectiontool.c
* app/tools/gimptexttool.c
* app/widgets/gimpdrawabletreeview.c
* app/widgets/gimplayertreeview.c
* app/xcf/xcf-save.c
* tools/pdbgen/pdb/image.pdb: changed accordingly, replaced some
instances of direct acces by the accessor.
* app/pdb/image-cmds.c: regenerated.
Modified:
trunk/ChangeLog
trunk/app/actions/channels-actions.c
trunk/app/actions/image-actions.c
trunk/app/actions/layers-actions.c
trunk/app/actions/layers-commands.c
trunk/app/actions/select-actions.c
trunk/app/core/gimpdrawable.c
trunk/app/core/gimpimage-duplicate.c
trunk/app/core/gimpimage-merge.c
trunk/app/core/gimpimage-quick-mask.c
trunk/app/core/gimpimage.c
trunk/app/core/gimpimage.h
trunk/app/core/gimplayer-floating-sel.c
trunk/app/core/gimpselection.c
trunk/app/display/gimpdisplayshell-layer-select.c
trunk/app/display/gimpdisplayshell.c
trunk/app/pdb/image-cmds.c
trunk/app/tools/gimpeditselectiontool.c
trunk/app/tools/gimpfreeselecttool.c
trunk/app/tools/gimpmovetool.c
trunk/app/tools/gimprectangleselecttool.c
trunk/app/tools/gimpregionselecttool.c
trunk/app/tools/gimpselectiontool.c
trunk/app/tools/gimptexttool.c
trunk/app/widgets/gimpdrawabletreeview.c
trunk/app/widgets/gimplayertreeview.c
trunk/app/xcf/xcf-save.c
trunk/tools/pdbgen/pdb/image.pdb
Modified: trunk/app/actions/channels-actions.c
==============================================================================
--- trunk/app/actions/channels-actions.c (original)
+++ trunk/app/actions/channels-actions.c Fri Nov 14 15:01:44 2008
@@ -153,7 +153,7 @@
if (image)
{
- fs = (gimp_image_floating_sel (image) != NULL);
+ fs = (gimp_image_get_floating_selection (image) != NULL);
if (GIMP_IS_COMPONENT_EDITOR (data))
{
Modified: trunk/app/actions/image-actions.c
==============================================================================
--- trunk/app/actions/image-actions.c (original)
+++ trunk/app/actions/image-actions.c Fri Nov 14 15:01:44 2008
@@ -246,7 +246,7 @@
gimp_action_group_set_action_active (group, action, TRUE);
- fs = (gimp_image_floating_sel (image) != NULL);
+ fs = (gimp_image_get_floating_selection (image) != NULL);
aux = (gimp_image_get_active_channel (image) != NULL);
lp = ! gimp_image_is_empty (image);
sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
Modified: trunk/app/actions/layers-actions.c
==============================================================================
--- trunk/app/actions/layers-actions.c (original)
+++ trunk/app/actions/layers-actions.c Fri Nov 14 15:01:44 2008
@@ -481,7 +481,7 @@
if (image)
{
- fs = (gimp_image_floating_sel (image) != NULL);
+ fs = (gimp_image_get_floating_selection (image) != NULL);
ac = (gimp_image_get_active_channel (image) != NULL);
sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
indexed = (gimp_image_base_type (image) == GIMP_INDEXED);
Modified: trunk/app/actions/layers-commands.c
==============================================================================
--- trunk/app/actions/layers-commands.c (original)
+++ trunk/app/actions/layers-commands.c Fri Nov 14 15:01:44 2008
@@ -228,7 +228,7 @@
/* If there is a floating selection, the new command transforms
* the current fs into a new layer
*/
- if ((floating_sel = gimp_image_floating_sel (image)))
+ if ((floating_sel = gimp_image_get_floating_selection (image)))
{
GError *error = NULL;
@@ -281,7 +281,7 @@
/* If there is a floating selection, the new command transforms
* the current fs into a new layer
*/
- if ((floating_sel = gimp_image_floating_sel (image)))
+ if ((floating_sel = gimp_image_get_floating_selection (image)))
{
GError *error = NULL;
Modified: trunk/app/actions/select-actions.c
==============================================================================
--- trunk/app/actions/select-actions.c (original)
+++ trunk/app/actions/select-actions.c Fri Nov 14 15:01:44 2008
@@ -142,7 +142,7 @@
{
drawable = gimp_image_get_active_drawable (image);
- fs = (gimp_image_floating_sel (image) != NULL);
+ fs = (gimp_image_get_floating_selection (image) != NULL);
sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
}
Modified: trunk/app/core/gimpdrawable.c
==============================================================================
--- trunk/app/core/gimpdrawable.c (original)
+++ trunk/app/core/gimpdrawable.c Fri Nov 14 15:01:44 2008
@@ -1050,7 +1050,7 @@
if (gimp_drawable_has_floating_sel (drawable))
{
GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
- GimpLayer *fs = gimp_image_floating_sel (image);
+ GimpLayer *fs = gimp_image_get_floating_selection (image);
gint off_x, off_y;
gint fs_off_x, fs_off_y;
gint combine_x, combine_y;
@@ -1621,7 +1621,7 @@
image = gimp_item_get_image (GIMP_ITEM (drawable));
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
return (floating_sel && floating_sel->fs.drawable == drawable);
}
Modified: trunk/app/core/gimpimage-duplicate.c
==============================================================================
--- trunk/app/core/gimpimage-duplicate.c (original)
+++ trunk/app/core/gimpimage-duplicate.c Fri Nov 14 15:01:44 2008
@@ -94,7 +94,7 @@
gimp_image_set_unit (new_image, gimp_image_get_unit (image));
/* Copy floating layer */
- floating_layer = gimp_image_floating_sel (image);
+ floating_layer = gimp_image_get_floating_selection (image);
if (floating_layer)
{
floating_sel_drawable = floating_layer->fs.drawable;
@@ -127,7 +127,7 @@
if (gimp_image_get_active_layer (image) == layer)
active_layer = new_layer;
- if (image->floating_sel == layer)
+ if (gimp_image_get_floating_selection (image) == layer)
floating_layer = new_layer;
if (floating_sel_drawable == GIMP_DRAWABLE (layer))
Modified: trunk/app/core/gimpimage-merge.c
==============================================================================
--- trunk/app/core/gimpimage-merge.c (original)
+++ trunk/app/core/gimpimage-merge.c Fri Nov 14 15:01:44 2008
@@ -76,9 +76,9 @@
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
/* if there's a floating selection, anchor it */
- if (gimp_image_floating_sel (image))
+ if (gimp_image_get_floating_selection (image))
{
- floating_sel_anchor (image->floating_sel);
+ floating_sel_anchor (gimp_image_get_floating_selection (image));
had_floating_sel = TRUE;
}
@@ -149,8 +149,8 @@
gimp_set_busy (image->gimp);
/* if there's a floating selection, anchor it */
- if (gimp_image_floating_sel (image))
- floating_sel_anchor (image->floating_sel);
+ if (gimp_image_get_floating_selection (image))
+ floating_sel_anchor (gimp_image_get_floating_selection (image));
for (list = gimp_image_get_layer_iter (image);
list;
Modified: trunk/app/core/gimpimage-quick-mask.c
==============================================================================
--- trunk/app/core/gimpimage-quick-mask.c (original)
+++ trunk/app/core/gimpimage-quick-mask.c Fri Nov 14 15:01:44 2008
@@ -85,7 +85,7 @@
{
/* if no selection */
- GimpLayer *floating_sel = gimp_image_floating_sel (image);
+ GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
if (floating_sel)
floating_sel_to_layer (floating_sel, NULL);
@@ -126,7 +126,7 @@
{
if (mask)
{
- GimpLayer *floating_sel = gimp_image_floating_sel (image);
+ GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
_("Disable Quick Mask"));
Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c (original)
+++ trunk/app/core/gimpimage.c Fri Nov 14 15:01:44 2008
@@ -1616,7 +1616,7 @@
}
GimpLayer *
-gimp_image_floating_sel (const GimpImage *image)
+gimp_image_get_floating_selection (const GimpImage *image)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
@@ -1685,7 +1685,7 @@
if (index != -1 && active != image->active[index])
{
- GimpLayer *floating_sel = gimp_image_floating_sel (image);
+ GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
image->active[index] = active ? TRUE : FALSE;
@@ -2645,7 +2645,7 @@
gimp_container_have (image->layers,
GIMP_OBJECT (layer)), NULL);
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
/* Make sure the floating_sel always is the active layer */
if (floating_sel && layer != floating_sel)
@@ -2686,7 +2686,7 @@
GIMP_OBJECT (channel)), NULL);
/* Not if there is a floating selection */
- if (channel && gimp_image_floating_sel (image))
+ if (channel && gimp_image_get_floating_selection (image))
return NULL;
if (channel != image->active_channel)
@@ -2919,7 +2919,7 @@
g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (layer)) == image,
FALSE);
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
active_layer = gimp_image_get_active_layer (image);
@@ -2997,7 +2997,7 @@
_("Remove Layer"));
undo_group = TRUE;
- gimp_image_remove_layer (image, gimp_image_floating_sel (image),
+ gimp_image_remove_layer (image, gimp_image_get_floating_selection (image),
TRUE, NULL);
}
@@ -3008,7 +3008,7 @@
old_has_alpha = gimp_image_has_alpha (image);
- if (image->floating_sel == layer)
+ if (gimp_image_get_floating_selection (image) == layer)
{
undo_desc = _("Remove Floating Selection");
@@ -3037,7 +3037,7 @@
gimp_container_remove (image->layers, GIMP_OBJECT (layer));
image->layer_stack = g_slist_remove (image->layer_stack, layer);
- if (image->floating_sel == layer)
+ if (gimp_image_get_floating_selection (image) == layer)
{
/* If this was the floating selection, reset the fs pointer
* and activate the underlying drawable
@@ -3335,7 +3335,7 @@
_("Remove Channel"));
undo_group = TRUE;
- gimp_image_remove_layer (image, gimp_image_floating_sel (image),
+ gimp_image_remove_layer (image, gimp_image_get_floating_selection (image),
TRUE, NULL);
}
Modified: trunk/app/core/gimpimage.h
==============================================================================
--- trunk/app/core/gimpimage.h (original)
+++ trunk/app/core/gimpimage.h Fri Nov 14 15:01:44 2008
@@ -280,7 +280,7 @@
gboolean gimp_image_has_alpha (const GimpImage *image);
gboolean gimp_image_is_empty (const GimpImage *image);
-GimpLayer * gimp_image_floating_sel (const GimpImage *image);
+GimpLayer * gimp_image_get_floating_selection (const GimpImage *image);
void gimp_image_floating_selection_changed (GimpImage *image);
GimpChannel * gimp_image_get_mask (const GimpImage *image);
Modified: trunk/app/core/gimplayer-floating-sel.c
==============================================================================
--- trunk/app/core/gimplayer-floating-sel.c (original)
+++ trunk/app/core/gimplayer-floating-sel.c Fri Nov 14 15:01:44 2008
@@ -65,7 +65,7 @@
image = gimp_item_get_image (GIMP_ITEM (drawable));
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
/* If there is already a floating selection, anchor it */
if (floating_sel)
Modified: trunk/app/core/gimpselection.c
==============================================================================
--- trunk/app/core/gimpselection.c (original)
+++ trunk/app/core/gimpselection.c Fri Nov 14 15:01:44 2008
@@ -330,7 +330,7 @@
GimpDrawable *drawable;
GimpLayer *layer;
- if ((layer = gimp_image_floating_sel (image)))
+ if ((layer = gimp_image_get_floating_selection (image)))
{
/* If there is a floating selection, then
* we need to do some slightly different boundaries.
Modified: trunk/app/display/gimpdisplayshell-layer-select.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-layer-select.c (original)
+++ trunk/app/display/gimpdisplayshell-layer-select.c Fri Nov 14 15:01:44 2008
@@ -197,7 +197,7 @@
return;
/* If there is a floating selection, allow no advancement */
- if (gimp_image_floating_sel (layer_select->image))
+ if (gimp_image_get_floating_selection (layer_select->image))
return;
current_layer = gimp_image_get_active_layer (layer_select->image);
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Fri Nov 14 15:01:44 2008
@@ -1635,7 +1635,7 @@
g_return_val_if_fail (y2 != NULL, FALSE);
/* If there is a floating selection, handle things differently */
- if ((layer = gimp_image_floating_sel (shell->display->image)))
+ if ((layer = gimp_image_get_floating_selection (shell->display->image)))
{
gint off_x;
gint off_y;
Modified: trunk/app/pdb/image-cmds.c
==============================================================================
--- trunk/app/pdb/image-cmds.c (original)
+++ trunk/app/pdb/image-cmds.c Fri Nov 14 15:01:44 2008
@@ -745,7 +745,7 @@
if (success)
{
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
}
return_vals = gimp_procedure_get_return_values (procedure, success,
@@ -774,7 +774,7 @@
if (success)
{
- GimpLayer *floating_sel = gimp_image_floating_sel (image);
+ GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
if (floating_sel)
drawable = floating_sel->fs.drawable;
Modified: trunk/app/tools/gimpeditselectiontool.c
==============================================================================
--- trunk/app/tools/gimpeditselectiontool.c (original)
+++ trunk/app/tools/gimpeditselectiontool.c Fri Nov 14 15:01:44 2008
@@ -212,7 +212,7 @@
/* Make a check to see if it should be a floating selection translation */
if ((edit_mode == GIMP_TRANSLATE_MODE_MASK_TO_LAYER ||
edit_mode == GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER) &&
- gimp_image_floating_sel (display->image))
+ gimp_image_get_floating_selection (display->image))
{
edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
}
Modified: trunk/app/tools/gimpfreeselecttool.c
==============================================================================
--- trunk/app/tools/gimpfreeselecttool.c (original)
+++ trunk/app/tools/gimpfreeselecttool.c Fri Nov 14 15:01:44 2008
@@ -849,9 +849,9 @@
GimpFreeSelectToolPrivate *priv = GET_PRIVATE (fst);
/* If there is a floating selection, anchor it */
- if (gimp_image_floating_sel (display->image))
+ if (gimp_image_get_floating_selection (display->image))
{
- floating_sel_anchor (gimp_image_floating_sel (display->image));
+ floating_sel_anchor (gimp_image_get_floating_selection (display->image));
gimp_free_select_tool_halt (fst);
}
else
Modified: trunk/app/tools/gimpmovetool.c
==============================================================================
--- trunk/app/tools/gimpmovetool.c (original)
+++ trunk/app/tools/gimpmovetool.c Fri Nov 14 15:01:44 2008
@@ -285,13 +285,15 @@
coords->x,
coords->y)))
{
- if (gimp_image_floating_sel (display->image) &&
+ if (gimp_image_get_floating_selection (display->image) &&
! gimp_layer_is_floating_sel (layer))
{
/* If there is a floating selection, and this aint it,
* use the move tool to anchor it.
*/
- move->floating_layer = gimp_image_floating_sel (display->image);
+ move->floating_layer =
+ gimp_image_get_floating_selection (display->image);
+
gimp_tool_control_activate (tool->control);
return;
@@ -749,7 +751,7 @@
coords->x, coords->y)))
{
/* if there is a floating selection, and this aint it... */
- if (gimp_image_floating_sel (display->image) &&
+ if (gimp_image_get_floating_selection (display->image) &&
! gimp_layer_is_floating_sel (layer))
{
tool_cursor = GIMP_TOOL_CURSOR_MOVE;
Modified: trunk/app/tools/gimprectangleselecttool.c
==============================================================================
--- trunk/app/tools/gimprectangleselecttool.c (original)
+++ trunk/app/tools/gimprectangleselecttool.c Fri Nov 14 15:01:44 2008
@@ -760,9 +760,9 @@
gint pressx;
gint pressy;
- if (gimp_image_floating_sel (image))
+ if (gimp_image_get_floating_selection (image))
{
- floating_sel_anchor (gimp_image_floating_sel (image));
+ floating_sel_anchor (gimp_image_get_floating_selection (image));
gimp_image_flush (image);
return TRUE;
}
Modified: trunk/app/tools/gimpregionselecttool.c
==============================================================================
--- trunk/app/tools/gimpregionselecttool.c (original)
+++ trunk/app/tools/gimpregionselecttool.c Fri Nov 14 15:01:44 2008
@@ -193,10 +193,10 @@
if (GIMP_SELECTION_TOOL (tool)->function == SELECTION_ANCHOR)
{
- if (gimp_image_floating_sel (display->image))
+ if (gimp_image_get_floating_selection (display->image))
{
/* If there is a floating selection, anchor it */
- floating_sel_anchor (gimp_image_floating_sel (display->image));
+ floating_sel_anchor (gimp_image_get_floating_selection (display->image));
}
else
{
Modified: trunk/app/tools/gimpselectiontool.c
==============================================================================
--- trunk/app/tools/gimpselectiontool.c (original)
+++ trunk/app/tools/gimpselectiontool.c Fri Nov 14 15:01:44 2008
@@ -174,7 +174,7 @@
drawable = gimp_image_get_active_drawable (display->image);
layer = gimp_image_pick_correlate_layer (display->image,
coords->x, coords->y);
- floating_sel = gimp_image_floating_sel (display->image);
+ floating_sel = gimp_image_get_floating_selection (display->image);
if (drawable)
{
Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c (original)
+++ trunk/app/tools/gimptexttool.c Fri Nov 14 15:01:44 2008
@@ -1747,13 +1747,13 @@
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TEXT,
_("Add Text Layer"));
- if (gimp_image_floating_sel (image))
+ if (gimp_image_get_floating_selection (image))
{
g_signal_handlers_block_by_func (image,
gimp_text_tool_layer_changed,
text_tool);
- floating_sel_anchor (gimp_image_floating_sel (image));
+ floating_sel_anchor (gimp_image_get_floating_selection (image));
g_signal_handlers_unblock_by_func (image,
gimp_text_tool_layer_changed,
Modified: trunk/app/widgets/gimpdrawabletreeview.c
==============================================================================
--- trunk/app/widgets/gimpdrawabletreeview.c (original)
+++ trunk/app/widgets/gimpdrawabletreeview.c Fri Nov 14 15:01:44 2008
@@ -174,7 +174,8 @@
if (item_view->image)
{
- GimpLayer *floating_sel = gimp_image_floating_sel (item_view->image);
+ GimpLayer *floating_sel =
+ gimp_image_get_floating_selection (item_view->image);
success = (item == NULL ||
floating_sel == NULL ||
Modified: trunk/app/widgets/gimplayertreeview.c
==============================================================================
--- trunk/app/widgets/gimplayertreeview.c (original)
+++ trunk/app/widgets/gimplayertreeview.c Fri Nov 14 15:01:44 2008
@@ -642,7 +642,7 @@
{
GimpImage *dest_image = GIMP_ITEM_TREE_VIEW (tree_view)->image;
- if (gimp_image_floating_sel (dest_image))
+ if (gimp_image_get_floating_selection (dest_image))
return FALSE;
}
@@ -858,7 +858,7 @@
GimpLayer *floating_sel;
GtkTreeIter *iter;
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
if (floating_sel)
{
Modified: trunk/app/xcf/xcf-save.c
==============================================================================
--- trunk/app/xcf/xcf-save.c (original)
+++ trunk/app/xcf/xcf-save.c Fri Nov 14 15:01:44 2008
@@ -465,7 +465,7 @@
if (layer == gimp_image_get_active_layer (image))
xcf_check_error (xcf_save_prop (info, image, PROP_ACTIVE_LAYER, error));
- if (layer == gimp_image_floating_sel (image))
+ if (layer == gimp_image_get_floating_selection (image))
{
info->floating_sel_drawable = layer->fs.drawable;
xcf_check_error (xcf_save_prop (info, image, PROP_FLOATING_SELECTION,
Modified: trunk/tools/pdbgen/pdb/image.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/image.pdb (original)
+++ trunk/tools/pdbgen/pdb/image.pdb Fri Nov 14 15:01:44 2008
@@ -1679,7 +1679,7 @@
%invoke = (
code => <<'CODE'
{
- floating_sel = gimp_image_floating_sel (image);
+ floating_sel = gimp_image_get_floating_selection (image);
}
CODE
);
@@ -1708,7 +1708,7 @@
%invoke = (
code => <<'CODE'
{
- GimpLayer *floating_sel = gimp_image_floating_sel (image);
+ GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
if (floating_sel)
drawable = floating_sel->fs.drawable;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]