mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 20:41:43 +00:00
884b3aa7a3
2003-03-17 Michael Natterer <mitch@gimp.org> Made drawable/layer properties (visibility, opacity etc.) undoable (fixes bug #73893). * app/core/core-enums.[ch]: added undo types/groups for visibility, mode, opacity, linked and preserve_trans. * app/core/Makefile.am * app/core/core-types.h * app/core/gimpitemundo.[ch]: new GimpUndo subclass which holds a ref'ed GimpItem pointer so (1) this doesn't need to be done by all undo steps related to an item and (2) the item the undo step is for can be determined from outside the undo system. * app/core/gimpimage-undo.[ch]: added gimp_image_undo_push_item() which returns a new GimpItemUndo. * app/core/gimpimage-undo-push.[ch]: use it for all item related undo steps. Removed lots of GimpItem, GimpLayer, GimpDrawable and GimpVectors pointers from the private undo structs. Added undo push functions for the new undo types added above. * app/core/gimpdrawable.[ch] (gimp_drawable_set_visible): added "gboolean push_undo" parameter. * app/core/gimplayer.[ch] (gimp_layer_set_opacity, _mode, _preserve_trans, _linked): added "gboolean push_undo" parameters. * app/core/gimpimage-mask.c * app/core/gimpimage-merge.c * app/core/gimplayer-floating-sel.c * app/tools/gimpmovetool.c * app/xcf/xcf-load.c * app/widgets/gimpdrawablelistitem.c * app/widgets/gimplayerlistitem.c * app/widgets/gimplayerlistview.c: changed accordingly. * tools/pdbgen/pdb/channel.pdb * tools/pdbgen/pdb/layer.pdb: ditto. Added '$undo' paramaters to the foo_accessors() functions. Removed $func from foo_accesors() because we don't manipulate items without using getters/setters any longer. * app/pdb/channel_cmds.c * app/pdb/layer_cmds.c: regenerated. * app/widgets/gimpcellrenderertoggle.[ch]: added "clicked" signal which carries an additional "GdkModifierType state" parameter as in GimpCellRendererViewable . * app/widgets/gimpcontainertreeview.c: emit "clicked" from the toggle renderer, not "toggled" so the callbacks get the modifier state. * app/widgets/gimpdrawabletreeview.c: resurrected the "exclusive visible by <shift>+click" feature as in 1.2. * app/widgets/gimplayertreeview.c: compress layer opacity undos by looking at the top of the undo stack and not pushing an undo if there already is a GIMP_UNDO_DRAWABLE_OPACITY for the active layer.
521 lines
18 KiB
C
521 lines
18 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpdrawabletreeview.c
|
|
* Copyright (C) 2001-2003 Michael Natterer <mitch@gimp.org>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpchannel.h"
|
|
#include "core/gimpcontainer.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpdrawable.h"
|
|
#include "core/gimpdrawable-bucket-fill.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-undo.h"
|
|
#include "core/gimplayer.h"
|
|
#include "core/gimpmarshal.h"
|
|
#include "core/gimppattern.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "gimpcellrenderertoggle.h"
|
|
#include "gimpchanneltreeview.h"
|
|
#include "gimpdnd.h"
|
|
#include "gimpitemfactory.h"
|
|
#include "gimplayertreeview.h"
|
|
#include "gimppreviewrenderer.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
static void gimp_drawable_tree_view_class_init (GimpDrawableTreeViewClass *klass);
|
|
static void gimp_drawable_tree_view_init (GimpDrawableTreeView *view);
|
|
|
|
static GObject *gimp_drawable_tree_view_constructor (GType type,
|
|
guint n_params,
|
|
GObjectConstructParam *params);
|
|
static void gimp_drawable_tree_view_set_container (GimpContainerView *view,
|
|
GimpContainer *container);
|
|
static gpointer gimp_drawable_tree_view_insert_item (GimpContainerView *view,
|
|
GimpViewable *viewable,
|
|
gint index);
|
|
|
|
static void gimp_drawable_tree_view_set_image (GimpItemTreeView *view,
|
|
GimpImage *gimage);
|
|
|
|
static gboolean gimp_drawable_tree_view_select (GtkTreeSelection *selection,
|
|
GtkTreeModel *model,
|
|
GtkTreePath *path,
|
|
gboolean path_currently_selected,
|
|
gpointer data);
|
|
|
|
static void gimp_drawable_tree_view_floating_selection_changed
|
|
(GimpImage *gimage,
|
|
GimpDrawableTreeView *view);
|
|
|
|
static void gimp_drawable_tree_view_new_pattern_dropped
|
|
(GtkWidget *widget,
|
|
GimpViewable *viewable,
|
|
gpointer data);
|
|
static void gimp_drawable_tree_view_new_color_dropped
|
|
(GtkWidget *widget,
|
|
const GimpRGB *color,
|
|
gpointer data);
|
|
|
|
static void gimp_drawable_tree_view_visibility_changed
|
|
(GimpDrawable *drawable,
|
|
GimpDrawableTreeView *view);
|
|
static void gimp_drawable_tree_view_eye_clicked(GtkCellRendererToggle *toggle,
|
|
gchar *path,
|
|
GdkModifierType state,
|
|
GimpDrawableTreeView *view);
|
|
|
|
|
|
static GimpItemTreeViewClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_drawable_tree_view_get_type (void)
|
|
{
|
|
static GType view_type = 0;
|
|
|
|
if (! view_type)
|
|
{
|
|
static const GTypeInfo view_info =
|
|
{
|
|
sizeof (GimpDrawableTreeViewClass),
|
|
NULL, /* base_init */
|
|
NULL, /* base_finalize */
|
|
(GClassInitFunc) gimp_drawable_tree_view_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpDrawableTreeView),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_drawable_tree_view_init,
|
|
};
|
|
|
|
view_type = g_type_register_static (GIMP_TYPE_ITEM_TREE_VIEW,
|
|
"GimpDrawableTreeView",
|
|
&view_info, 0);
|
|
}
|
|
|
|
return view_type;
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_class_init (GimpDrawableTreeViewClass *klass)
|
|
{
|
|
GObjectClass *object_class;
|
|
GimpContainerViewClass *container_view_class;
|
|
GimpItemTreeViewClass *item_view_class;
|
|
|
|
object_class = G_OBJECT_CLASS (klass);
|
|
container_view_class = GIMP_CONTAINER_VIEW_CLASS (klass);
|
|
item_view_class = GIMP_ITEM_TREE_VIEW_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->constructor = gimp_drawable_tree_view_constructor;
|
|
|
|
container_view_class->set_container = gimp_drawable_tree_view_set_container;
|
|
container_view_class->insert_item = gimp_drawable_tree_view_insert_item;
|
|
|
|
item_view_class->set_image = gimp_drawable_tree_view_set_image;
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_init (GimpDrawableTreeView *view)
|
|
{
|
|
GimpContainerTreeView *tree_view;
|
|
GimpItemTreeView *item_view;
|
|
|
|
tree_view = GIMP_CONTAINER_TREE_VIEW (view);
|
|
item_view = GIMP_ITEM_TREE_VIEW (view);
|
|
|
|
view->model_column_visible = tree_view->n_model_columns;
|
|
|
|
tree_view->model_columns[tree_view->n_model_columns++] = G_TYPE_BOOLEAN;
|
|
|
|
gimp_dnd_viewable_dest_add (item_view->new_button, GIMP_TYPE_PATTERN,
|
|
gimp_drawable_tree_view_new_pattern_dropped,
|
|
view);
|
|
gimp_dnd_color_dest_add (item_view->new_button,
|
|
gimp_drawable_tree_view_new_color_dropped,
|
|
view);
|
|
}
|
|
|
|
static GObject *
|
|
gimp_drawable_tree_view_constructor (GType type,
|
|
guint n_params,
|
|
GObjectConstructParam *params)
|
|
{
|
|
GimpContainerTreeView *tree_view;
|
|
GimpDrawableTreeView *drawable_view;
|
|
GObject *object;
|
|
GtkTreeViewColumn *column;
|
|
|
|
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
|
|
|
|
tree_view = GIMP_CONTAINER_TREE_VIEW (object);
|
|
drawable_view = GIMP_DRAWABLE_TREE_VIEW (object);
|
|
|
|
column = gtk_tree_view_column_new ();
|
|
gtk_tree_view_insert_column (tree_view->view, column, 0);
|
|
|
|
drawable_view->eye_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
|
|
gtk_tree_view_column_pack_start (column, drawable_view->eye_cell, FALSE);
|
|
gtk_tree_view_column_set_attributes (column, drawable_view->eye_cell,
|
|
"active",
|
|
drawable_view->model_column_visible,
|
|
NULL);
|
|
|
|
tree_view->toggle_cells = g_list_prepend (tree_view->toggle_cells,
|
|
drawable_view->eye_cell);
|
|
|
|
g_signal_connect (drawable_view->eye_cell, "clicked",
|
|
G_CALLBACK (gimp_drawable_tree_view_eye_clicked),
|
|
drawable_view);
|
|
|
|
gtk_tree_selection_set_select_function (tree_view->selection,
|
|
gimp_drawable_tree_view_select,
|
|
drawable_view, NULL);
|
|
|
|
return object;
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_set_container (GimpContainerView *view,
|
|
GimpContainer *container)
|
|
{
|
|
GimpDrawableTreeView *drawable_view;
|
|
|
|
drawable_view = GIMP_DRAWABLE_TREE_VIEW (view);
|
|
|
|
if (view->container)
|
|
{
|
|
gimp_container_remove_handler (view->container,
|
|
drawable_view->visibility_changed_handler_id);
|
|
}
|
|
|
|
GIMP_CONTAINER_VIEW_CLASS (parent_class)->set_container (view, container);
|
|
|
|
if (view->container)
|
|
{
|
|
drawable_view->visibility_changed_handler_id =
|
|
gimp_container_add_handler (view->container, "visibility_changed",
|
|
G_CALLBACK (gimp_drawable_tree_view_visibility_changed),
|
|
view);
|
|
}
|
|
}
|
|
|
|
static gpointer
|
|
gimp_drawable_tree_view_insert_item (GimpContainerView *view,
|
|
GimpViewable *viewable,
|
|
gint index)
|
|
{
|
|
GtkTreeIter *iter;
|
|
|
|
iter = GIMP_CONTAINER_VIEW_CLASS (parent_class)->insert_item (view, viewable,
|
|
index);
|
|
|
|
gtk_list_store_set (GTK_LIST_STORE (GIMP_CONTAINER_TREE_VIEW (view)->model),
|
|
iter,
|
|
GIMP_DRAWABLE_TREE_VIEW (view)->model_column_visible,
|
|
gimp_drawable_get_visible (GIMP_DRAWABLE (viewable)),
|
|
-1);
|
|
|
|
return iter;
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_set_image (GimpItemTreeView *item_view,
|
|
GimpImage *gimage)
|
|
{
|
|
GimpDrawableTreeView *view;
|
|
|
|
g_return_if_fail (GIMP_IS_DRAWABLE_TREE_VIEW (item_view));
|
|
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
|
|
|
|
view = GIMP_DRAWABLE_TREE_VIEW (item_view);
|
|
|
|
if (item_view->gimage)
|
|
{
|
|
g_signal_handlers_disconnect_by_func (item_view->gimage,
|
|
gimp_drawable_tree_view_floating_selection_changed,
|
|
view);
|
|
}
|
|
|
|
GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (item_view, gimage);
|
|
|
|
if (item_view->gimage)
|
|
{
|
|
g_signal_connect (item_view->gimage,
|
|
"floating_selection_changed",
|
|
G_CALLBACK (gimp_drawable_tree_view_floating_selection_changed),
|
|
view);
|
|
|
|
if (gimp_image_floating_sel (item_view->gimage))
|
|
gimp_drawable_tree_view_floating_selection_changed (item_view->gimage,
|
|
view);
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
gimp_drawable_tree_view_select (GtkTreeSelection *selection,
|
|
GtkTreeModel *model,
|
|
GtkTreePath *path,
|
|
gboolean path_currently_selected,
|
|
gpointer data)
|
|
{
|
|
GimpItemTreeView *item_view;
|
|
GtkTreeIter iter;
|
|
gboolean retval = TRUE;
|
|
|
|
item_view = GIMP_ITEM_TREE_VIEW (data);
|
|
|
|
if (gimp_image_floating_sel (item_view->gimage) &&
|
|
gtk_tree_model_get_iter (model, &iter, path))
|
|
{
|
|
GimpContainerTreeView *tree_view;
|
|
GimpPreviewRenderer *renderer;
|
|
|
|
tree_view = GIMP_CONTAINER_TREE_VIEW (item_view);
|
|
|
|
gtk_tree_model_get (model, &iter,
|
|
tree_view->model_column_renderer, &renderer,
|
|
-1);
|
|
|
|
if (((GimpLayer *) renderer->viewable ==
|
|
gimp_image_floating_sel (item_view->gimage)))
|
|
{
|
|
if (path_currently_selected)
|
|
retval = FALSE;
|
|
}
|
|
else
|
|
{
|
|
if (! path_currently_selected)
|
|
retval = FALSE;
|
|
}
|
|
|
|
g_print ("gimp_drawable_tree_view_select: floating sel present (%d)\n",
|
|
retval);
|
|
|
|
g_object_unref (renderer);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_floating_selection_changed (GimpImage *gimage,
|
|
GimpDrawableTreeView *view)
|
|
{
|
|
#if 0
|
|
GimpViewable *floating_sel;
|
|
GList *list;
|
|
GList *free_list;
|
|
|
|
floating_sel = (GimpViewable *) gimp_image_floating_sel (gimage);
|
|
|
|
list = free_list = gtk_container_get_children
|
|
(GTK_CONTAINER (GIMP_CONTAINER_TREE_VIEW (view)->gtk_tree));
|
|
|
|
for (; list; list = g_list_next (list))
|
|
{
|
|
if (! (GIMP_PREVIEW (GIMP_TREE_ITEM (list->data)->preview)->viewable ==
|
|
floating_sel))
|
|
{
|
|
gtk_widget_set_sensitive (GTK_WIDGET (list->data),
|
|
floating_sel == NULL);
|
|
}
|
|
}
|
|
|
|
g_list_free (free_list);
|
|
|
|
/* update button states */
|
|
/* gimp_drawable_tree_view_drawable_changed (gimage, view); */
|
|
#endif
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_new_dropped (GimpItemTreeView *view,
|
|
GimpBucketFillMode fill_mode,
|
|
const GimpRGB *color,
|
|
GimpPattern *pattern)
|
|
{
|
|
GimpDrawable *drawable;
|
|
GimpToolInfo *tool_info;
|
|
GimpContext *context;
|
|
|
|
gimp_image_undo_group_start (view->gimage, GIMP_UNDO_GROUP_EDIT_PASTE,
|
|
_("New Layer"));
|
|
|
|
view->new_item_func (view->gimage, NULL, FALSE);
|
|
|
|
drawable = gimp_image_active_drawable (view->gimage);
|
|
|
|
/* Get the bucket fill context */
|
|
tool_info = (GimpToolInfo *)
|
|
gimp_container_get_child_by_name (view->gimage->gimp->tool_info_list,
|
|
"gimp-bucket-fill-tool");
|
|
|
|
if (tool_info && tool_info->tool_options)
|
|
{
|
|
context = GIMP_CONTEXT (tool_info->tool_options);
|
|
}
|
|
else
|
|
{
|
|
context = gimp_get_user_context (view->gimage->gimp);
|
|
}
|
|
|
|
gimp_drawable_bucket_fill_full (drawable,
|
|
fill_mode,
|
|
gimp_context_get_paint_mode (context),
|
|
gimp_context_get_opacity (context),
|
|
FALSE /* no seed fill */,
|
|
FALSE, 0.0, FALSE, 0.0, 0.0 /* fill params */,
|
|
color, pattern);
|
|
|
|
gimp_image_undo_group_end (view->gimage);
|
|
|
|
gimp_image_flush (view->gimage);
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_new_pattern_dropped (GtkWidget *widget,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
gimp_drawable_tree_view_new_dropped (GIMP_ITEM_TREE_VIEW (data),
|
|
GIMP_PATTERN_BUCKET_FILL,
|
|
NULL,
|
|
GIMP_PATTERN (viewable));
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_new_color_dropped (GtkWidget *widget,
|
|
const GimpRGB *color,
|
|
gpointer data)
|
|
{
|
|
gimp_drawable_tree_view_new_dropped (GIMP_ITEM_TREE_VIEW (data),
|
|
GIMP_FG_BUCKET_FILL,
|
|
color,
|
|
NULL);
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_visibility_changed (GimpDrawable *drawable,
|
|
GimpDrawableTreeView *view)
|
|
{
|
|
GimpContainerView *container_view;
|
|
GimpContainerTreeView *tree_view;
|
|
GtkTreeIter *iter;
|
|
|
|
container_view = GIMP_CONTAINER_VIEW (view);
|
|
tree_view = GIMP_CONTAINER_TREE_VIEW (view);
|
|
|
|
iter = g_hash_table_lookup (container_view->hash_table, drawable);
|
|
|
|
if (iter)
|
|
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
|
|
view->model_column_visible,
|
|
gimp_drawable_get_visible (drawable),
|
|
-1);
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_tree_view_eye_clicked (GtkCellRendererToggle *toggle,
|
|
gchar *path_str,
|
|
GdkModifierType state,
|
|
GimpDrawableTreeView *view)
|
|
{
|
|
GimpContainerTreeView *tree_view;
|
|
GtkTreePath *path;
|
|
GtkTreeIter iter;
|
|
|
|
tree_view = GIMP_CONTAINER_TREE_VIEW (view);
|
|
|
|
path = gtk_tree_path_new_from_string (path_str);
|
|
|
|
if (gtk_tree_model_get_iter (tree_view->model, &iter, path))
|
|
{
|
|
GimpPreviewRenderer *renderer;
|
|
GimpDrawable *drawable;
|
|
GimpImage *gimage;
|
|
gboolean active;
|
|
|
|
gtk_tree_model_get (tree_view->model, &iter,
|
|
tree_view->model_column_renderer, &renderer,
|
|
-1);
|
|
g_object_get (toggle,
|
|
"active", &active,
|
|
NULL);
|
|
|
|
drawable = GIMP_DRAWABLE (renderer->viewable);
|
|
g_object_unref (renderer);
|
|
|
|
gimage = gimp_item_get_image (GIMP_ITEM (drawable));
|
|
|
|
if (state & GDK_SHIFT_MASK)
|
|
{
|
|
gboolean iter_valid;
|
|
|
|
gimp_image_undo_group_start (gimage,
|
|
GIMP_UNDO_GROUP_DRAWABLE_VISIBILITY,
|
|
_("Set Drawable Exclusive Visible"));
|
|
|
|
for (iter_valid = gtk_tree_model_get_iter_first (tree_view->model,
|
|
&iter);
|
|
iter_valid;
|
|
iter_valid = gtk_tree_model_iter_next (tree_view->model,
|
|
&iter))
|
|
{
|
|
gtk_tree_model_get (tree_view->model, &iter,
|
|
tree_view->model_column_renderer, &renderer,
|
|
-1);
|
|
|
|
if (renderer->viewable != (GimpViewable *) drawable)
|
|
gimp_drawable_set_visible (GIMP_DRAWABLE (renderer->viewable),
|
|
FALSE, TRUE);
|
|
|
|
g_object_unref (renderer);
|
|
}
|
|
|
|
gimp_drawable_set_visible (drawable, TRUE, TRUE);
|
|
|
|
gimp_image_undo_group_end (gimage);
|
|
}
|
|
else
|
|
{
|
|
gimp_drawable_set_visible (drawable, !active, TRUE);
|
|
}
|
|
|
|
gimp_image_flush (gimage);
|
|
}
|
|
|
|
gtk_tree_path_free (path);
|
|
}
|