25b81b1570
2004-02-14 Michael Natterer <mitch@gimp.org> Fixed lots of QuickMask brokenness by letting the image adjust its qmask_state automatically: * app/core/gimpimage-qmask.h: #define GIMP_IMAGE_QMASK_NAME "Qmask". Use the define in all files below. * app/core/gimpimage.[ch]: split gimp_image_drawable_add,_remove() into separate handlers for layers and channels. Added a "name_changed" handler for all channels. In the channel "add", "remove" and "name_changed" handlers, check if it was a channel named "Qmask" that was added, removed or renamed and call gimp_image_set_qmask_state() accordingly. * app/core/core-enums.[ch] * app/core/gimpimage-undo-push.[ch] * app/core/gimpundo.c: removed all Qmask undo code because the image does the right thing without undo interaction now. * app/core/gimpimage-qmask.c (gimp_image_set_qmask_state): set gimage->qmask_state early so we can return early when called recursively. Removed calls to gimp_image_undo_push_image_qmask(). Returned "removed" callback (it was utterly broken the way it was implemented). * app/display/gimpdisplayshell-callbacks.c (gimp_display_shell_qmask_toggled): check if the image's qmask state needs to be changed before changing it. * app/xcf/xcf-load.c (xcf_load_channel): removed code which recognized the qmask. GimpImage does this automatically now. * app/gui/qmask-commands.c: cleanup. * app/widgets/gimpimagedock.c (gimp_image_dock_constructor): destroy the "/Select/By Color" and "/Select/Toggle QuickMask" menu items. * app/widgets/image-menu.c (image_menu_update): changed accordingly.
203 lines
12 KiB
C
203 lines
12 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.
|
|
*/
|
|
|
|
#ifndef __GIMP_IMAGE_UNDO_PUSH_H__
|
|
#define __GIMP_IMAGE_UNDO_PUSH_H__
|
|
|
|
|
|
/* image undos */
|
|
|
|
gboolean gimp_image_undo_push_image (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpDrawable *drawable,
|
|
gint x1,
|
|
gint y1,
|
|
gint x2,
|
|
gint y2);
|
|
gboolean gimp_image_undo_push_image_mod (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpDrawable *drawable,
|
|
gint x1,
|
|
gint y1,
|
|
gint x2,
|
|
gint y2,
|
|
TileManager *tiles,
|
|
gboolean sparse);
|
|
gboolean gimp_image_undo_push_image_type (GimpImage *gimage,
|
|
const gchar *undo_desc);
|
|
gboolean gimp_image_undo_push_image_size (GimpImage *gimage,
|
|
const gchar *undo_desc);
|
|
gboolean gimp_image_undo_push_image_resolution (GimpImage *gimage,
|
|
const gchar *undo_desc);
|
|
gboolean gimp_image_undo_push_image_grid (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpGrid *grid);
|
|
gboolean gimp_image_undo_push_image_guide (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpGuide *guide);
|
|
gboolean gimp_image_undo_push_image_colormap (GimpImage *gimage,
|
|
const gchar *undo_desc);
|
|
|
|
|
|
/* mask undo */
|
|
|
|
gboolean gimp_image_undo_push_mask (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *mask);
|
|
|
|
|
|
/* item undos */
|
|
|
|
gboolean gimp_image_undo_push_item_rename (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item);
|
|
gboolean gimp_image_undo_push_item_displace (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item);
|
|
gboolean gimp_image_undo_push_item_visibility (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item);
|
|
gboolean gimp_image_undo_push_item_linked (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item);
|
|
|
|
|
|
/* layer undos */
|
|
|
|
gboolean gimp_image_undo_push_layer_add (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer,
|
|
gint prev_position,
|
|
GimpLayer *prev_layer);
|
|
gboolean gimp_image_undo_push_layer_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer,
|
|
gint prev_position,
|
|
GimpLayer *prev_layer);
|
|
gboolean gimp_image_undo_push_layer_mod (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer);
|
|
gboolean gimp_image_undo_push_layer_mask_add (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer,
|
|
GimpLayerMask *mask);
|
|
gboolean gimp_image_undo_push_layer_mask_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer,
|
|
GimpLayerMask *mask);
|
|
gboolean gimp_image_undo_push_layer_reposition (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer);
|
|
gboolean gimp_image_undo_push_layer_mode (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer);
|
|
gboolean gimp_image_undo_push_layer_opacity (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer);
|
|
gboolean gimp_image_undo_push_layer_preserve_trans (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *layer);
|
|
|
|
/* text layer undo */
|
|
gboolean gimp_image_undo_push_text_layer (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpTextLayer *layer);
|
|
|
|
/* channel undos */
|
|
|
|
gboolean gimp_image_undo_push_channel_add (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *channel,
|
|
gint prev_position,
|
|
GimpChannel *prev_channel);
|
|
gboolean gimp_image_undo_push_channel_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *channel,
|
|
gint prev_position,
|
|
GimpChannel *prev_channel);
|
|
gboolean gimp_image_undo_push_channel_mod (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *channel);
|
|
gboolean gimp_image_undo_push_channel_reposition (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *channel);
|
|
gboolean gimp_image_undo_push_channel_color (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpChannel *channel);
|
|
|
|
|
|
/* vectors undos */
|
|
|
|
gboolean gimp_image_undo_push_vectors_add (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpVectors *vectors,
|
|
gint prev_position,
|
|
GimpVectors *prev_vectors);
|
|
gboolean gimp_image_undo_push_vectors_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpVectors *channel,
|
|
gint prev_position,
|
|
GimpVectors *prev_vectors);
|
|
gboolean gimp_image_undo_push_vectors_mod (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpVectors *vectors);
|
|
gboolean gimp_image_undo_push_vectors_reposition (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpVectors *vectors);
|
|
|
|
|
|
/* floating selection undos */
|
|
|
|
gboolean gimp_image_undo_push_fs_to_layer (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *floating_layer,
|
|
GimpDrawable *drawable);
|
|
gboolean gimp_image_undo_push_fs_rigor (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *floating_layer);
|
|
gboolean gimp_image_undo_push_fs_relax (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpLayer *floating_layer);
|
|
|
|
|
|
/* parasite undos */
|
|
|
|
gboolean gimp_image_undo_push_image_parasite (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
gpointer parasite);
|
|
gboolean gimp_image_undo_push_image_parasite_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
const gchar *name);
|
|
|
|
gboolean gimp_image_undo_push_item_parasite (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item,
|
|
gpointer parasite);
|
|
gboolean gimp_image_undo_push_item_parasite_remove (GimpImage *gimage,
|
|
const gchar *undo_desc,
|
|
GimpItem *item,
|
|
const gchar *name);
|
|
|
|
|
|
/* EEK undo */
|
|
|
|
gboolean gimp_image_undo_push_cantundo (GimpImage *gimage,
|
|
const gchar *undo_desc);
|
|
|
|
|
|
#endif /* __GIMP_IMAGE_UNDO_PUSH_H__ */
|