mirror of https://github.com/GNOME/gimp.git
app/widgets/Makefile.am new files containing the toolbox' drop callbacks.
2003-06-06 Michael Natterer <mitch@gimp.org> * app/widgets/Makefile.am * app/widgets/gimptoolbox-dnd.[ch]: new files containing the toolbox' drop callbacks. Exports gimp_toolbox_dnd_init(). * app/widgets/gimptoolbox.c: removed the callbacks and all the "core/" includes they needed and call gimp_toolbox_dnd_init().
This commit is contained in:
Michael Natterer
Michael Natterer
parent
bc93e4a041
commit
98bdd5c0f3
|
|
@ -1,3 +1,12 @@
|
||||||
|
2003-06-06 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
|
* app/widgets/Makefile.am
|
||||||
|
* app/widgets/gimptoolbox-dnd.[ch]: new files containing the
|
||||||
|
toolbox' drop callbacks. Exports gimp_toolbox_dnd_init().
|
||||||
|
|
||||||
|
* app/widgets/gimptoolbox.c: removed the callbacks and all the
|
||||||
|
"core/" includes they needed and call gimp_toolbox_dnd_init().
|
||||||
|
|
||||||
2003-06-06 Sven Neumann <sven@gimp.org>
|
2003-06-06 Sven Neumann <sven@gimp.org>
|
||||||
|
|
||||||
* app/core/gimptoolinfo.[ch]: added "in_toolbox"; defaults to TRUE.
|
* app/core/gimptoolinfo.[ch]: added "in_toolbox"; defaults to TRUE.
|
||||||
|
|
|
||||||
|
|
@ -149,6 +149,8 @@ libappwidgets_a_sources = \
|
||||||
gimptoolbox.h \
|
gimptoolbox.h \
|
||||||
gimptoolbox-color-area.c \
|
gimptoolbox-color-area.c \
|
||||||
gimptoolbox-color-area.h \
|
gimptoolbox-color-area.h \
|
||||||
|
gimptoolbox-dnd.c \
|
||||||
|
gimptoolbox-dnd.h \
|
||||||
gimptoolbox-indicator-area.c \
|
gimptoolbox-indicator-area.c \
|
||||||
gimptoolbox-indicator-area.h \
|
gimptoolbox-indicator-area.h \
|
||||||
gimpundoeditor.c \
|
gimpundoeditor.c \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,182 @@
|
||||||
|
/* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
#include "libgimpwidgets/gimpwidgets.h"
|
||||||
|
|
||||||
|
#include "widgets-types.h"
|
||||||
|
|
||||||
|
#include "core/gimp.h"
|
||||||
|
#include "core/gimpbuffer.h"
|
||||||
|
#include "core/gimpcontext.h"
|
||||||
|
#include "core/gimpedit.h"
|
||||||
|
#include "core/gimpimage.h"
|
||||||
|
#include "core/gimpimage-colormap.h"
|
||||||
|
#include "core/gimplayer.h"
|
||||||
|
#include "core/gimplayermask.h"
|
||||||
|
#include "core/gimptoolinfo.h"
|
||||||
|
|
||||||
|
#include "gimpdnd.h"
|
||||||
|
#include "gimptoolbox.h"
|
||||||
|
#include "gimptoolbox-dnd.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* local function prototypes */
|
||||||
|
|
||||||
|
static void gimp_toolbox_drop_drawable (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data);
|
||||||
|
static void gimp_toolbox_drop_tool (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data);
|
||||||
|
static void gimp_toolbox_drop_buffer (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data);
|
||||||
|
|
||||||
|
|
||||||
|
/* public functions */
|
||||||
|
|
||||||
|
void
|
||||||
|
gimp_toolbox_dnd_init (GimpToolbox *toolbox)
|
||||||
|
{
|
||||||
|
GimpDock *dock;
|
||||||
|
|
||||||
|
g_return_if_fail (GIMP_IS_TOOLBOX (toolbox));
|
||||||
|
|
||||||
|
dock = GIMP_DOCK (toolbox);
|
||||||
|
|
||||||
|
gimp_dnd_file_dest_add (GTK_WIDGET (toolbox), gimp_dnd_open_files, NULL);
|
||||||
|
|
||||||
|
gimp_dnd_file_dest_add (toolbox->wbox, gimp_dnd_open_files, NULL);
|
||||||
|
|
||||||
|
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_LAYER,
|
||||||
|
gimp_toolbox_drop_drawable,
|
||||||
|
dock->context);
|
||||||
|
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_LAYER_MASK,
|
||||||
|
gimp_toolbox_drop_drawable,
|
||||||
|
dock->context);
|
||||||
|
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_CHANNEL,
|
||||||
|
gimp_toolbox_drop_drawable,
|
||||||
|
dock->context);
|
||||||
|
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_TOOL_INFO,
|
||||||
|
gimp_toolbox_drop_tool,
|
||||||
|
dock->context);
|
||||||
|
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_BUFFER,
|
||||||
|
gimp_toolbox_drop_buffer,
|
||||||
|
dock->context);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* private functions */
|
||||||
|
|
||||||
|
static void
|
||||||
|
gimp_toolbox_drop_drawable (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data)
|
||||||
|
{
|
||||||
|
GimpDrawable *drawable;
|
||||||
|
GimpItem *item;
|
||||||
|
GimpImage *gimage;
|
||||||
|
GimpImage *new_gimage;
|
||||||
|
GimpLayer *new_layer;
|
||||||
|
gint width, height;
|
||||||
|
gint off_x, off_y;
|
||||||
|
gint bytes;
|
||||||
|
GimpImageBaseType type;
|
||||||
|
|
||||||
|
drawable = GIMP_DRAWABLE (viewable);
|
||||||
|
item = GIMP_ITEM (viewable);
|
||||||
|
gimage = gimp_item_get_image (item);
|
||||||
|
|
||||||
|
width = gimp_item_width (item);
|
||||||
|
height = gimp_item_height (item);
|
||||||
|
bytes = gimp_drawable_bytes (drawable);
|
||||||
|
|
||||||
|
type = GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable));
|
||||||
|
|
||||||
|
new_gimage = gimp_create_image (gimage->gimp,
|
||||||
|
width, height,
|
||||||
|
type,
|
||||||
|
FALSE);
|
||||||
|
gimp_image_undo_disable (new_gimage);
|
||||||
|
|
||||||
|
if (type == GIMP_INDEXED) /* copy the colormap */
|
||||||
|
gimp_image_set_colormap (new_gimage,
|
||||||
|
gimp_image_get_colormap (gimage),
|
||||||
|
gimp_image_get_colormap_size (gimage),
|
||||||
|
FALSE);
|
||||||
|
|
||||||
|
gimp_image_set_resolution (new_gimage,
|
||||||
|
gimage->xresolution, gimage->yresolution);
|
||||||
|
gimp_image_set_unit (new_gimage, gimage->unit);
|
||||||
|
|
||||||
|
if (GIMP_IS_LAYER (drawable))
|
||||||
|
{
|
||||||
|
new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (drawable),
|
||||||
|
G_TYPE_FROM_INSTANCE (drawable),
|
||||||
|
FALSE));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (drawable),
|
||||||
|
GIMP_TYPE_LAYER,
|
||||||
|
TRUE));
|
||||||
|
}
|
||||||
|
|
||||||
|
gimp_item_set_image (GIMP_ITEM (new_layer), new_gimage);
|
||||||
|
|
||||||
|
gimp_object_set_name (GIMP_OBJECT (new_layer),
|
||||||
|
gimp_object_get_name (GIMP_OBJECT (drawable)));
|
||||||
|
|
||||||
|
gimp_item_offsets (GIMP_ITEM (new_layer), &off_x, &off_y);
|
||||||
|
gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);
|
||||||
|
|
||||||
|
gimp_image_add_layer (new_gimage, new_layer, 0);
|
||||||
|
|
||||||
|
gimp_image_undo_enable (new_gimage);
|
||||||
|
|
||||||
|
gimp_create_display (gimage->gimp, new_gimage, 0x0101);
|
||||||
|
|
||||||
|
g_object_unref (new_gimage);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
gimp_toolbox_drop_tool (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data)
|
||||||
|
{
|
||||||
|
GimpContext *context = GIMP_CONTEXT (data);
|
||||||
|
|
||||||
|
gimp_context_set_tool (context, GIMP_TOOL_INFO (viewable));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
gimp_toolbox_drop_buffer (GtkWidget *widget,
|
||||||
|
GimpViewable *viewable,
|
||||||
|
gpointer data)
|
||||||
|
{
|
||||||
|
GimpContext *context = GIMP_CONTEXT (data);
|
||||||
|
|
||||||
|
if (context->gimp->busy)
|
||||||
|
return;
|
||||||
|
|
||||||
|
gimp_edit_paste_as_new (context->gimp, NULL, GIMP_BUFFER (viewable));
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
/* 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_TOOLBOX_DND_H__
|
||||||
|
#define __GIMP_TOOLBOX_DND_H__
|
||||||
|
|
||||||
|
|
||||||
|
void gimp_toolbox_dnd_init (GimpToolbox *toolbox);
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* __GIMP_TOOLBOX_DND_H__ */
|
||||||
|
|
@ -27,22 +27,16 @@
|
||||||
#include "widgets-types.h"
|
#include "widgets-types.h"
|
||||||
|
|
||||||
#include "core/gimp.h"
|
#include "core/gimp.h"
|
||||||
#include "core/gimpbuffer.h"
|
|
||||||
#include "core/gimpcontext.h"
|
#include "core/gimpcontext.h"
|
||||||
#include "core/gimpedit.h"
|
|
||||||
#include "core/gimpimage.h"
|
|
||||||
#include "core/gimpimage-colormap.h"
|
|
||||||
#include "core/gimplayer.h"
|
|
||||||
#include "core/gimplayermask.h"
|
|
||||||
#include "core/gimplist.h"
|
#include "core/gimplist.h"
|
||||||
#include "core/gimptoolinfo.h"
|
#include "core/gimptoolinfo.h"
|
||||||
|
|
||||||
#include "gimpdevices.h"
|
#include "gimpdevices.h"
|
||||||
#include "gimpdialogfactory.h"
|
#include "gimpdialogfactory.h"
|
||||||
#include "gimpdnd.h"
|
|
||||||
#include "gimpitemfactory.h"
|
#include "gimpitemfactory.h"
|
||||||
#include "gimptoolbox.h"
|
#include "gimptoolbox.h"
|
||||||
#include "gimptoolbox-color-area.h"
|
#include "gimptoolbox-color-area.h"
|
||||||
|
#include "gimptoolbox-dnd.h"
|
||||||
#include "gimptoolbox-indicator-area.h"
|
#include "gimptoolbox-indicator-area.h"
|
||||||
#include "gtkhwrapbox.h"
|
#include "gtkhwrapbox.h"
|
||||||
|
|
||||||
|
|
@ -91,16 +85,6 @@ static gboolean toolbox_check_device (GtkWidget *widget,
|
||||||
GdkEvent *event,
|
GdkEvent *event,
|
||||||
Gimp *gimp);
|
Gimp *gimp);
|
||||||
|
|
||||||
static void toolbox_drop_drawable (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data);
|
|
||||||
static void toolbox_drop_tool (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data);
|
|
||||||
static void toolbox_drop_buffer (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data);
|
|
||||||
|
|
||||||
|
|
||||||
/* local variables */
|
/* local variables */
|
||||||
|
|
||||||
|
|
@ -489,25 +473,7 @@ gimp_toolbox_new (GimpDialogFactory *dialog_factory,
|
||||||
toolbox->wbox,
|
toolbox->wbox,
|
||||||
0);
|
0);
|
||||||
|
|
||||||
gimp_dnd_file_dest_add (GTK_WIDGET (toolbox), gimp_dnd_open_files, NULL);
|
gimp_toolbox_dnd_init (GIMP_TOOLBOX (toolbox));
|
||||||
|
|
||||||
gimp_dnd_file_dest_add (toolbox->wbox, gimp_dnd_open_files, NULL);
|
|
||||||
|
|
||||||
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_LAYER,
|
|
||||||
toolbox_drop_drawable,
|
|
||||||
context);
|
|
||||||
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_LAYER_MASK,
|
|
||||||
toolbox_drop_drawable,
|
|
||||||
context);
|
|
||||||
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_CHANNEL,
|
|
||||||
toolbox_drop_drawable,
|
|
||||||
context);
|
|
||||||
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_TOOL_INFO,
|
|
||||||
toolbox_drop_tool,
|
|
||||||
context);
|
|
||||||
gimp_dnd_viewable_dest_add (toolbox->wbox, GIMP_TYPE_BUFFER,
|
|
||||||
toolbox_drop_buffer,
|
|
||||||
context);
|
|
||||||
|
|
||||||
gimp_toolbox_style_set (GTK_WIDGET (toolbox), GTK_WIDGET (toolbox)->style);
|
gimp_toolbox_style_set (GTK_WIDGET (toolbox), GTK_WIDGET (toolbox)->style);
|
||||||
|
|
||||||
|
|
@ -847,101 +813,3 @@ toolbox_check_device (GtkWidget *widget,
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
toolbox_drop_drawable (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data)
|
|
||||||
{
|
|
||||||
GimpDrawable *drawable;
|
|
||||||
GimpItem *item;
|
|
||||||
GimpImage *gimage;
|
|
||||||
GimpImage *new_gimage;
|
|
||||||
GimpLayer *new_layer;
|
|
||||||
gint width, height;
|
|
||||||
gint off_x, off_y;
|
|
||||||
gint bytes;
|
|
||||||
GimpImageBaseType type;
|
|
||||||
|
|
||||||
drawable = GIMP_DRAWABLE (viewable);
|
|
||||||
item = GIMP_ITEM (viewable);
|
|
||||||
gimage = gimp_item_get_image (item);
|
|
||||||
|
|
||||||
width = gimp_item_width (item);
|
|
||||||
height = gimp_item_height (item);
|
|
||||||
bytes = gimp_drawable_bytes (drawable);
|
|
||||||
|
|
||||||
type = GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable));
|
|
||||||
|
|
||||||
new_gimage = gimp_create_image (gimage->gimp,
|
|
||||||
width, height,
|
|
||||||
type,
|
|
||||||
FALSE);
|
|
||||||
gimp_image_undo_disable (new_gimage);
|
|
||||||
|
|
||||||
if (type == GIMP_INDEXED) /* copy the colormap */
|
|
||||||
gimp_image_set_colormap (new_gimage,
|
|
||||||
gimp_image_get_colormap (gimage),
|
|
||||||
gimp_image_get_colormap_size (gimage),
|
|
||||||
FALSE);
|
|
||||||
|
|
||||||
gimp_image_set_resolution (new_gimage,
|
|
||||||
gimage->xresolution, gimage->yresolution);
|
|
||||||
gimp_image_set_unit (new_gimage, gimage->unit);
|
|
||||||
|
|
||||||
if (GIMP_IS_LAYER (drawable))
|
|
||||||
{
|
|
||||||
new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (drawable),
|
|
||||||
G_TYPE_FROM_INSTANCE (drawable),
|
|
||||||
FALSE));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
new_layer = GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (drawable),
|
|
||||||
GIMP_TYPE_LAYER,
|
|
||||||
TRUE));
|
|
||||||
}
|
|
||||||
|
|
||||||
gimp_item_set_image (GIMP_ITEM (new_layer), new_gimage);
|
|
||||||
|
|
||||||
gimp_object_set_name (GIMP_OBJECT (new_layer),
|
|
||||||
gimp_object_get_name (GIMP_OBJECT (drawable)));
|
|
||||||
|
|
||||||
gimp_item_offsets (GIMP_ITEM (new_layer), &off_x, &off_y);
|
|
||||||
gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);
|
|
||||||
|
|
||||||
gimp_image_add_layer (new_gimage, new_layer, 0);
|
|
||||||
|
|
||||||
gimp_image_undo_enable (new_gimage);
|
|
||||||
|
|
||||||
gimp_create_display (gimage->gimp, new_gimage, 0x0101);
|
|
||||||
|
|
||||||
g_object_unref (new_gimage);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
toolbox_drop_tool (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data)
|
|
||||||
{
|
|
||||||
GimpContext *context;
|
|
||||||
|
|
||||||
context = (GimpContext *) data;
|
|
||||||
|
|
||||||
gimp_context_set_tool (context, GIMP_TOOL_INFO (viewable));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
toolbox_drop_buffer (GtkWidget *widget,
|
|
||||||
GimpViewable *viewable,
|
|
||||||
gpointer data)
|
|
||||||
{
|
|
||||||
GimpContext *context;
|
|
||||||
|
|
||||||
context = (GimpContext *) data;
|
|
||||||
|
|
||||||
if (context->gimp->busy)
|
|
||||||
return;
|
|
||||||
|
|
||||||
gimp_edit_paste_as_new (context->gimp, NULL, GIMP_BUFFER (viewable));
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue