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

app: rename more stuff from "floating sel" to "floating selection"

This commit is contained in:
Michael Natterer 2016-05-20 16:46:26 +02:00
parent cf4d0cc40e
commit 2ef8719cbe
29 changed files with 112 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/actions/layers-actions.c
View File

@ -27,7 +27,7 @@
#include "core/gimpchannel.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "text/gimptextlayer.h"

2
app/actions/layers-commands.c
View File

@ -41,7 +41,7 @@
#include "core/gimpimage-undo.h"
#include "core/gimpimage-undo-push.h"
#include "core/gimpitemundo.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimplayer-new.h"
#include "core/gimppickable.h"
#include "core/gimppickable-auto-shrink.h"

8
app/core/Makefile.am
View File

@ -192,8 +192,8 @@ libappcore_a_sources = \
gimpfilteredcontainer.h \
gimpfilterstack.c \
gimpfilterstack.h \
gimpfloatingselundo.c \
gimpfloatingselundo.h \
gimpfloatingselectionundo.c \
gimpfloatingselectionundo.h \
gimpgradient.c \
gimpgradient.h \
gimpgradient-load.c \
@ -295,8 +295,8 @@ libappcore_a_sources = \
gimpitemundo.h \
gimplayer.c \
gimplayer.h \
gimplayer-floating-sel.c \
gimplayer-floating-sel.h \
gimplayer-floating-selection.c \
gimplayer-floating-selection.h \
gimplayer-new.c \
gimplayer-new.h \
gimplayermask.c \

1
app/core/core-types.h
View File

@ -170,7 +170,6 @@ typedef struct _GimpGroupLayerUndo GimpGroupLayerUndo;
typedef struct _GimpMaskUndo GimpMaskUndo;
typedef struct _GimpGuideUndo GimpGuideUndo;
typedef struct _GimpSamplePointUndo GimpSamplePointUndo;
typedef struct _GimpFloatingSelUndo GimpFloatingSelUndo;
typedef struct _GimpUndoStack GimpUndoStack;
typedef struct _GimpUndoAccumulator GimpUndoAccumulator;

2
app/core/gimp-edit.c
View File

@ -41,7 +41,7 @@
#include "gimpimage.h"
#include "gimpimage-undo.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayer-new.h"
#include "gimplist.h"
#include "gimppattern.h"

2
app/core/gimpdrawable-transform.c
View File

@ -42,7 +42,7 @@
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayer-new.h"
#include "gimppickable.h"
#include "gimpprogress.h"

48
app/core/gimpfloatingselundo.c → app/core/gimpfloatingselectionundo.c
View File

@ -23,45 +23,48 @@
#include "core-types.h"
#include "gimpdrawable-floating-selection.h"
#include "gimpfloatingselundo.h"
#include "gimpfloatingselectionundo.h"
#include "gimpimage.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
static void gimp_floating_sel_undo_constructed (GObject *object);
static void gimp_floating_selection_undo_constructed (GObject *object);
static void gimp_floating_sel_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void gimp_floating_selection_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
G_DEFINE_TYPE (GimpFloatingSelUndo, gimp_floating_sel_undo, GIMP_TYPE_ITEM_UNDO)
G_DEFINE_TYPE (GimpFloatingSelectionUndo, gimp_floating_selection_undo,
GIMP_TYPE_ITEM_UNDO)
#define parent_class gimp_floating_sel_undo_parent_class
#define parent_class gimp_floating_selection_undo_parent_class
static void
gimp_floating_sel_undo_class_init (GimpFloatingSelUndoClass *klass)
gimp_floating_selection_undo_class_init (GimpFloatingSelectionUndoClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpUndoClass *undo_class = GIMP_UNDO_CLASS (klass);
object_class->constructed = gimp_floating_sel_undo_constructed;
object_class->constructed = gimp_floating_selection_undo_constructed;
undo_class->pop = gimp_floating_sel_undo_pop;
undo_class->pop = gimp_floating_selection_undo_pop;
}
static void
gimp_floating_sel_undo_init (GimpFloatingSelUndo *undo)
gimp_floating_selection_undo_init (GimpFloatingSelectionUndo *undo)
{
}
static void
gimp_floating_sel_undo_constructed (GObject *object)
gimp_floating_selection_undo_constructed (GObject *object)
{
GimpFloatingSelUndo *floating_sel_undo = GIMP_FLOATING_SEL_UNDO (object);
GimpLayer *layer;
GimpFloatingSelectionUndo *floating_sel_undo;
GimpLayer *layer;
floating_sel_undo = GIMP_FLOATING_SELECTION_UNDO (object);
G_OBJECT_CLASS (parent_class)->constructed (object);
@ -81,12 +84,15 @@ gimp_floating_sel_undo_constructed (GObject *object)
}
static void
gimp_floating_sel_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
gimp_floating_selection_undo_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
{
GimpFloatingSelUndo *floating_sel_undo = GIMP_FLOATING_SEL_UNDO (undo);
GimpLayer *floating_layer = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
GimpFloatingSelectionUndo *floating_sel_undo;
GimpLayer *floating_layer;
floating_sel_undo = GIMP_FLOATING_SELECTION_UNDO (undo);
floating_layer = GIMP_LAYER (GIMP_ITEM_UNDO (undo)->item);
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
@ -95,7 +101,7 @@ gimp_floating_sel_undo_pop (GimpUndo *undo,
case GIMP_UNDO_FS_TO_LAYER:
if (undo_mode == GIMP_UNDO_MODE_UNDO)
{
/* Update the preview for the floating sel */
/* Update the preview for the floating selection */
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (floating_layer));
gimp_layer_set_floating_sel_drawable (floating_layer,

52
app/core/gimpfloatingselectionundo.h Normal file
View File

@ -0,0 +1,52 @@
/* GIMP - The GNU 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 3 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_FLOATING_SELECTION_UNDO_H__
#define __GIMP_FLOATING_SELECTION_UNDO_H__
#include "gimpitemundo.h"
#define GIMP_TYPE_FLOATING_SELECTION_UNDO (gimp_floating_selection_undo_get_type ())
#define GIMP_FLOATING_SELECTION_UNDO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndo))
#define GIMP_FLOATING_SELECTION_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndoClass))
#define GIMP_IS_FLOATING_SELECTION_UNDO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO))
#define GIMP_IS_FLOATING_SELECTION_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FLOATING_SELECTION_UNDO))
#define GIMP_FLOATING_SELECTION_UNDO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FLOATING_SELECTION_UNDO, GimpFloatingSelectionUndoClass))
typedef struct _GimpFloatingSelectionUndo GimpFloatingSelectionUndo;
typedef struct _GimpFloatingSelectionUndoClass GimpFloatingSelectionUndoClass;
struct _GimpFloatingSelectionUndo
{
GimpItemUndo parent_instance;
GimpDrawable *drawable;
};
struct _GimpFloatingSelectionUndoClass
{
GimpItemUndoClass parent_class;
};
GType gimp_floating_selection_undo_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_FLOATING_SELECTION_UNDO_H__ */

51
app/core/gimpfloatingselundo.h
View File

@ -1,51 +0,0 @@
/* GIMP - The GNU 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 3 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_FLOATING_SEL_UNDO_H__
#define __GIMP_FLOATING_SEL_UNDO_H__
#include "gimpitemundo.h"
#define GIMP_TYPE_FLOATING_SEL_UNDO (gimp_floating_sel_undo_get_type ())
#define GIMP_FLOATING_SEL_UNDO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FLOATING_SEL_UNDO, GimpFloatingSelUndo))
#define GIMP_FLOATING_SEL_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FLOATING_SEL_UNDO, GimpFloatingSelUndoClass))
#define GIMP_IS_FLOATING_SEL_UNDO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_FLOATING_SEL_UNDO))
#define GIMP_IS_FLOATING_SEL_UNDO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_FLOATING_SEL_UNDO))
#define GIMP_FLOATING_SEL_UNDO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_FLOATING_SEL_UNDO, GimpFloatingSelUndoClass))
typedef struct _GimpFloatingSelUndoClass GimpFloatingSelUndoClass;
struct _GimpFloatingSelUndo
{
GimpItemUndo parent_instance;
GimpDrawable *drawable;
};
struct _GimpFloatingSelUndoClass
{
GimpItemUndoClass parent_class;
};
GType gimp_floating_sel_undo_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_FLOATING_SEL_UNDO_H__ */

2
app/core/gimpimage-duplicate.c
View File

@ -40,7 +40,7 @@
#include "gimpitemstack.h"
#include "gimplayer.h"
#include "gimplayermask.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimpparasitelist.h"
#include "gimpsamplepoint.h"

2
app/core/gimpimage-merge.c
View File

@ -42,7 +42,7 @@
#include "gimpimage-merge.h"
#include "gimpimage-undo.h"
#include "gimpitemstack.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayer-new.h"
#include "gimplayermask.h"
#include "gimpmarshal.h"

2
app/core/gimpimage-quick-mask.c
View File

@ -33,7 +33,7 @@
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimpselection.h"
#include "gimp-intl.h"

4
app/core/gimpimage-undo-push.c
View File

@ -29,7 +29,7 @@
#include "gimpchannelundo.h"
#include "gimpdrawablemodundo.h"
#include "gimpdrawableundo.h"
#include "gimpfloatingselundo.h"
#include "gimpfloatingselectionundo.h"
#include "gimpgrid.h"
#include "gimpgrouplayer.h"
#include "gimpgrouplayerundo.h"
@ -922,7 +922,7 @@ gimp_image_undo_push_fs_to_layer (GimpImage *image,
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_LAYER (floating_layer), NULL);
undo = gimp_image_undo_push (image, GIMP_TYPE_FLOATING_SEL_UNDO,
undo = gimp_image_undo_push (image, GIMP_TYPE_FLOATING_SELECTION_UNDO,
GIMP_UNDO_FS_TO_LAYER, undo_desc,
GIMP_DIRTY_IMAGE_STRUCTURE,
"item", floating_layer,

2
app/core/gimpimage.c
View File

@ -62,7 +62,7 @@
#include "gimpimage-undo-push.h"
#include "gimpitemtree.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayermask.h"
#include "gimpmarshal.h"
#include "gimpparasitelist.h"

2
app/core/gimplayer-floating-sel.c → app/core/gimplayer-floating-selection.c
View File

@ -32,7 +32,7 @@
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimplayer.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayermask.h"
#include "gimp-intl.h"

6
app/core/gimplayer-floating-sel.h → app/core/gimplayer-floating-selection.h
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_LAYER_FLOATING_SEL_H__
#define __GIMP_LAYER_FLOATING_SEL_H__
#ifndef __GIMP_LAYER_FLOATING_SELECTION_H__
#define __GIMP_LAYER_FLOATING_SELECTION_H__
void floating_sel_attach (GimpLayer *layer,
@ -30,4 +30,4 @@ const GimpBoundSeg * floating_sel_boundary (GimpLayer *layer,
void floating_sel_invalidate (GimpLayer *layer);
#endif /* __GIMP_LAYER_FLOATING_SEL_H__ */
#endif /* __GIMP_LAYER_FLOATING_SELECTION_H__ */

2
app/core/gimplayer.c
View File

@ -46,7 +46,7 @@
#include "gimpimage-undo.h"
#include "gimpimage.h"
#include "gimpimage-color-profile.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimplayer.h"
#include "gimplayermask.h"
#include "gimpmarshal.h"

2
app/core/gimpselection.c
View File

@ -39,7 +39,7 @@
#include "gimplayer.h"
#include "gimplayer-new.h"
#include "gimplayermask.h"
#include "gimplayer-floating-sel.h"
#include "gimplayer-floating-selection.h"
#include "gimppickable.h"
#include "gimpselection.h"

2
app/display/gimpcanvaslayerboundary.c
View File

@ -30,7 +30,7 @@
#include "core/gimpchannel.h"
#include "core/gimplayer.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "gimpcanvas-style.h"
#include "gimpcanvaslayerboundary.h"

2
app/pdb/floating-sel-cmds.c
View File

@ -29,7 +29,7 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimplayer.h"
#include "core/gimpparamspecs.h"

2
app/text/gimptext-compat.c
View File

@ -35,7 +35,7 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "gimptext.h"
#include "gimptext-compat.h"

2
app/tools/gimpfreeselecttool.c
View File

@ -35,7 +35,7 @@
#include "core/gimpchannel.h"
#include "core/gimpchannel-select.h"
#include "core/gimpimage.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h"

2
app/tools/gimpmovetool.c
View File

@ -39,7 +39,7 @@
#include "core/gimplayer.h"
#include "core/gimpimage-undo.h"
#include "core/gimplayermask.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimpundostack.h"
#include "widgets/gimphelp-ids.h"

6
app/tools/gimprectangleselecttool.c
View File

@ -25,13 +25,13 @@
#include "tools-types.h"
#include "core/gimpchannel.h"
#include "core/gimp-utils.h"
#include "core/gimpchannel-select.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimpchannel.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimppickable.h"
#include "core/gimp-utils.h"
#include "core/gimpundostack.h"
#include "widgets/gimpdialogfactory.h"

2
app/tools/gimpregionselecttool.c
View File

@ -31,7 +31,7 @@
#include "core/gimpchannel.h"
#include "core/gimpchannel-select.h"
#include "core/gimpimage.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"

2
app/tools/gimptexttool.c
View File

@ -37,7 +37,7 @@
#include "core/gimpimage-pick-layer.h"
#include "core/gimpimage-undo.h"
#include "core/gimpimage-undo-push.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimpmarshal.h"
#include "core/gimptoolinfo.h"
#include "core/gimpundostack.h"

2
app/xcf/xcf-load.c
View File

@ -47,7 +47,7 @@
#include "core/gimpimage-sample-points.h"
#include "core/gimpimage-undo.h"
#include "core/gimpitemstack.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer-floating-selection.h"
#include "core/gimplayer-new.h"
#include "core/gimplayermask.h"
#include "core/gimpparasitelist.h"

2
po/POTFILES.in
View File

@ -160,7 +160,7 @@ app/core/gimpimagefile.c
app/core/gimpitem.c
app/core/gimpitem-exclusive.c
app/core/gimpitem-linked.c
app/core/gimplayer-floating-sel.c
app/core/gimplayer-floating-selection.c
app/core/gimplayer.c
app/core/gimplayermask.c
app/core/gimpmybrush-load.c

2
tools/pdbgen/pdb/floating_sel.pdb
View File

@ -200,7 +200,7 @@ CODE
@headers = qw("core/gimpimage.h"
"core/gimplayer-floating-sel.h"
"core/gimplayer-floating-selection.h"
"gimppdberror.h"
"gimppdb-utils.h"
"gimp-intl.h");