2004-05-12 Michael Natterer <mitch@gimp.org> * app/actions/documents-actions.c * app/actions/documents-commands.c * app/actions/edit-actions.c * app/actions/edit-commands.[ch] * app/actions/layers-actions.c * app/actions/layers-commands.c * app/actions/select-actions.c * app/actions/select-commands.[ch] * app/actions/vectors-actions.c * app/actions/vectors-commands.[ch]: added tooltips for actions which are now used for dialog buttons, added callback implementations which formerly lived in various widgets, moved some actions around and did some general cleanups. * menus/image-menu.xml.in: s/edit-stroke/select-stroke/ * menus/Makefile.am * menus/selection-editor-menu.xml: new popup menu. * app/menus/menus.c: register <SelectionEditor> and <UndoEditor> UI managers. * app/widgets/gimpeditor.[ch]: added construct properties "menu-factory", "menu-identifier", "ui-path" and "popup-data". Implement GObject::constructor() and create the UI manager if all needed properties were set. Enables creating action buttons at widget construction time because they need a UI manager. (gimp_editor_add_action_button): changed to take a va_list of "extended" actions which are invoked if the resp. button emits "extended_clicked". Store the actions and their modifier masks in a list attached to the button. * app/widgets/gimpcontainerview.c (gimp_container_view_item_selected): if the view has container *and* context, simply change the context and return. (gimp_container_view_context_changed): don't emit "select_item" manually but simply call gimp_container_view_select_item(). (gimp_container_view_viewable_dropped): use gimp_container_view_item_selected() instead of changing the context directly. * app/widgets/gimpcontainereditor.c (gimp_container_editor_select_item): update the UI manager. * app/widgets/gimpdockable.c: don't try to fiddle with the dialog's menu if it doesn't have a ui_path (happens if the UI manager is just a collection of actions for the dialog buttons and has no menu registered). * app/widgets/gimpimageeditor.c: connect to the image's "flush" signal and update the UI manager in the callback. * app/widgets/gimpitemtreeview.c: use GimpEditor's construct properties to create the UI manager so GimpItemTreeView subclasses can have action buttons. Update the UI manager in gimp_item_tree_view_select_item(). * app/widgets/gimpbufferview.c * app/widgets/gimpcolormapeditor.c * app/widgets/gimpcontainergridview.c * app/widgets/gimpdatafactoryview.c * app/widgets/gimpfontview.c * app/widgets/gimpimageview.c * app/widgets/gimptemplateview.c * app/widgets/gimptoolview.c: changed calls to gimp_editor_add_action_button() accordingly and removed some unneeded select_item() implementations. * app/widgets/gimpchanneltreeview.c * app/widgets/gimpvectorstreeview.[ch] * app/widgets/gimpdocumentview.[ch] * app/widgets/gimplayertreeview.c * app/widgets/gimpselectioneditor.[ch] * app/widgets/gimpundoeditor.[ch]: use action buttons and removed lots of callbacks which went to the resp. action callbacks. * app/widgets/widgets-types.h: removed some now unneeded function prototypes. * app/gui/dialogs-constructors.c: changed (simplified) many dialog constructors accordingly.
208 lines
6.2 KiB
C
208 lines
6.2 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpimage.h"
|
|
|
|
#include "gimpdocked.h"
|
|
#include "gimpimageeditor.h"
|
|
#include "gimpuimanager.h"
|
|
|
|
|
|
static void gimp_image_editor_class_init (GimpImageEditorClass *klass);
|
|
static void gimp_image_editor_init (GimpImageEditor *editor);
|
|
|
|
static void gimp_image_editor_docked_iface_init (GimpDockedInterface *docked_iface);
|
|
static void gimp_image_editor_set_docked_context (GimpDocked *docked,
|
|
GimpContext *context,
|
|
GimpContext *prev_context);
|
|
|
|
static void gimp_image_editor_destroy (GtkObject *object);
|
|
static void gimp_image_editor_real_set_image (GimpImageEditor *editor,
|
|
GimpImage *gimage);
|
|
|
|
static void gimp_image_editor_image_flush (GimpImage *gimage,
|
|
GimpImageEditor *editor);
|
|
|
|
|
|
static GimpEditorClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_image_editor_get_type (void)
|
|
{
|
|
static GType type = 0;
|
|
|
|
if (! type)
|
|
{
|
|
static const GTypeInfo editor_info =
|
|
{
|
|
sizeof (GimpImageEditorClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_image_editor_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpImageEditor),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_image_editor_init,
|
|
};
|
|
static const GInterfaceInfo docked_iface_info =
|
|
{
|
|
(GInterfaceInitFunc) gimp_image_editor_docked_iface_init,
|
|
NULL, /* iface_finalize */
|
|
NULL /* iface_data */
|
|
};
|
|
|
|
type = g_type_register_static (GIMP_TYPE_EDITOR,
|
|
"GimpImageEditor",
|
|
&editor_info, 0);
|
|
|
|
g_type_add_interface_static (type, GIMP_TYPE_DOCKED,
|
|
&docked_iface_info);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_class_init (GimpImageEditorClass *klass)
|
|
{
|
|
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->destroy = gimp_image_editor_destroy;
|
|
|
|
klass->set_image = gimp_image_editor_real_set_image;
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_init (GimpImageEditor *editor)
|
|
{
|
|
editor->gimage = NULL;
|
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_docked_iface_init (GimpDockedInterface *docked_iface)
|
|
{
|
|
docked_iface->set_context = gimp_image_editor_set_docked_context;
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_docked_context_changed (GimpContext *context,
|
|
GimpImage *gimage,
|
|
GimpImageEditor *editor)
|
|
{
|
|
gimp_image_editor_set_image (editor, gimage);
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_set_docked_context (GimpDocked *docked,
|
|
GimpContext *context,
|
|
GimpContext *prev_context)
|
|
{
|
|
GimpImageEditor *editor = GIMP_IMAGE_EDITOR (docked);
|
|
GimpImage *gimage = NULL;
|
|
|
|
if (prev_context)
|
|
g_signal_handlers_disconnect_by_func (prev_context,
|
|
gimp_image_editor_docked_context_changed,
|
|
editor);
|
|
|
|
if (context)
|
|
{
|
|
g_signal_connect (context, "image_changed",
|
|
G_CALLBACK (gimp_image_editor_docked_context_changed),
|
|
editor);
|
|
|
|
gimage = gimp_context_get_image (context);
|
|
}
|
|
|
|
gimp_image_editor_set_image (editor, gimage);
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_destroy (GtkObject *object)
|
|
{
|
|
GimpImageEditor *editor = GIMP_IMAGE_EDITOR (object);
|
|
|
|
if (editor->gimage)
|
|
gimp_image_editor_set_image (editor, NULL);
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
|
}
|
|
|
|
static void
|
|
gimp_image_editor_real_set_image (GimpImageEditor *editor,
|
|
GimpImage *gimage)
|
|
{
|
|
if (editor->gimage)
|
|
g_signal_handlers_disconnect_by_func (editor->gimage,
|
|
gimp_image_editor_image_flush,
|
|
editor);
|
|
|
|
editor->gimage = gimage;
|
|
|
|
if (editor->gimage)
|
|
g_signal_connect (editor->gimage, "flush",
|
|
G_CALLBACK (gimp_image_editor_image_flush),
|
|
editor);
|
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (editor), gimage != NULL);
|
|
}
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_image_editor_set_image (GimpImageEditor *editor,
|
|
GimpImage *gimage)
|
|
{
|
|
g_return_if_fail (GIMP_IS_IMAGE_EDITOR (editor));
|
|
g_return_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage));
|
|
|
|
if (gimage != editor->gimage)
|
|
{
|
|
GIMP_IMAGE_EDITOR_GET_CLASS (editor)->set_image (editor, gimage);
|
|
|
|
if (GIMP_EDITOR (editor)->ui_manager)
|
|
gimp_ui_manager_update (GIMP_EDITOR (editor)->ui_manager,
|
|
GIMP_EDITOR (editor)->popup_data);
|
|
}
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_image_editor_image_flush (GimpImage *gimage,
|
|
GimpImageEditor *editor)
|
|
{
|
|
if (GIMP_EDITOR (editor)->ui_manager)
|
|
gimp_ui_manager_update (GIMP_EDITOR (editor)->ui_manager,
|
|
GIMP_EDITOR (editor)->popup_data);
|
|
}
|