
2003-02-20 Michael Natterer <mitch@gimp.org> Reimplemented the undo history: * app/Makefile.am * app/undo_history.[ch]: removed. Changes/cleanups to the undo system to enable/simplify the new undo history implementation: * app/core/core-types.h: removed enum undo_event_t. Removed the GimpImage parameter from GimpUndoPopFunc and GimpUndoFreeFunc because GimpUndo has a GimpImage pointer now (see below). * app/core/core-enums.[ch]: added enum GimpUndoEvent. Added an enum value for REDO_EXPIRED. * app/core/gimpimage.[ch]: added a GimpUndo pointer to the "undo_event" signal which needs to be passed for all events except UNDO_FREE. * app/display/gimpdisplayshell-handlers.c: changed accordingly. * app/core/gimpundo.[ch]: added a GimpImage pointer to the GimpUndo struct. Removed GimpImage parameters all over the place. Added preview stuff. The preview creation needs to be triggered explicitly using gimp_undo_create_preview() because the GimpUndo can't know when it's possible to create the preview. * app/core/gimpimage-undo-push.c * app/paint/gimppaintcore-undo.c * app/tools/gimptransformtool-undo.c: changed accordingly, cleanup. * app/core/gimpundostack.[ch]: ditto. Return the freed undo from gimp_undo_stack_free_bottom(). Removed unused container signal handlers. * app/core/gimpimage-undo.c: free the redo stack the same way old undos are freed (from bottom up). Emit "undo_event" with event == REDO_EXPIRED for each removed redo. * app/core/gimpmarshal.list: added new marshallers. New undo history implementation: * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimpundoeditor.[ch] * app/widgets/gimpundopreview.[ch]: new widgets for the undo step previews and the history itself. * app/widgets/gimppreview-utils.c: added GimpUndoPreview to the list of possible preview types. * app/gui/dialogs-constructors.[ch] * app/gui/dialogs-menu.c * app/gui/dialogs.c * app/gui/image-menu.c * app/gui/toolbox-menu.c: removed the old and added the new undo history to the dialog factory and the various dialog menus. * app/widgets/gimpdnd.[ch]: don't warn if a GType has no corresponding DND type. Instead, return FALSE from the function that failed. * app/widgets/gimppreview.c: check the return value of gimpdnd functions. Not only add drag sources but also remove them when no longer needed. * app/widgets/gimpselectioneditor.h: removed unneeded inclusion of "gui/gui-types.h".
162 lines
6.7 KiB
C
162 lines
6.7 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 "gui-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpcontext.h"
|
|
|
|
#include "widgets/gimpdialogfactory.h"
|
|
#include "widgets/gimpitemfactory.h"
|
|
|
|
#include "dialogs.h"
|
|
#include "dialogs-constructors.h"
|
|
#include "menus.h"
|
|
|
|
|
|
GimpDialogFactory *global_dialog_factory = NULL;
|
|
GimpDialogFactory *global_dock_factory = NULL;
|
|
GimpDialogFactory *global_toolbox_factory = NULL;
|
|
|
|
|
|
static const GimpDialogFactoryEntry toplevel_entries[] =
|
|
{
|
|
{ "gimp-device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
|
|
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-tips-dialog", dialogs_tips_get, 32, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-about-dialog", dialogs_about_get, 32, TRUE, FALSE, FALSE, TRUE }
|
|
};
|
|
|
|
static const GimpDialogFactoryEntry dock_entries[] =
|
|
{
|
|
{ "gimp-tool-options", dialogs_tool_options_get, 0, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-error-console", dialogs_error_console_get, 0, TRUE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-image-list", dialogs_image_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-brush-list", dialogs_brush_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-pattern-list", dialogs_pattern_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-gradient-list", dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-palette-list", dialogs_palette_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-tool-list", dialogs_tool_list_view_new, 24, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-buffer-list", dialogs_buffer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-image-grid", dialogs_image_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-brush-grid", dialogs_brush_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-pattern-grid", dialogs_pattern_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-gradient-grid", dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-palette-grid", dialogs_palette_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-tool-grid", dialogs_tool_grid_view_new, 24, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-layer-list", dialogs_layer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-channel-list", dialogs_channel_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-vectors-list", dialogs_vectors_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-path-list", dialogs_path_list_view_new, 32, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-indexed-palette", dialogs_indexed_palette_new, 32, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-selection-editor", dialogs_selection_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
|
|
{ "gimp-undo-history", dialogs_undo_history_new, 0, FALSE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-color-editor", dialogs_color_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-document-history", dialogs_document_history_new, 48, FALSE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-brush-editor", dialogs_brush_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-gradient-editor", dialogs_gradient_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
|
|
{ "gimp-palette-editor", dialogs_palette_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
|
|
|
|
{ "gimp-navigation-view", dialogs_navigation_view_new, 0, FALSE, FALSE, FALSE, TRUE }
|
|
};
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
dialogs_init (Gimp *gimp)
|
|
{
|
|
gint i;
|
|
|
|
global_dialog_factory = gimp_dialog_factory_new ("toplevel",
|
|
gimp_get_user_context (gimp),
|
|
NULL,
|
|
NULL);
|
|
|
|
global_toolbox_factory = gimp_dialog_factory_new ("toolbox",
|
|
gimp_get_user_context (gimp),
|
|
global_menu_factory,
|
|
dialogs_toolbox_get);
|
|
|
|
global_dock_factory = gimp_dialog_factory_new ("dock",
|
|
gimp_get_user_context (gimp),
|
|
global_menu_factory,
|
|
dialogs_dock_new);
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (toplevel_entries); i++)
|
|
gimp_dialog_factory_register_entry (global_dialog_factory,
|
|
toplevel_entries[i].identifier,
|
|
toplevel_entries[i].new_func,
|
|
toplevel_entries[i].preview_size,
|
|
toplevel_entries[i].singleton,
|
|
toplevel_entries[i].session_managed,
|
|
toplevel_entries[i].remember_size,
|
|
toplevel_entries[i].remember_if_open);
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (dock_entries); i++)
|
|
gimp_dialog_factory_register_entry (global_dock_factory,
|
|
dock_entries[i].identifier,
|
|
dock_entries[i].new_func,
|
|
dock_entries[i].preview_size,
|
|
dock_entries[i].singleton,
|
|
dock_entries[i].session_managed,
|
|
dock_entries[i].remember_size,
|
|
dock_entries[i].remember_if_open);
|
|
}
|
|
|
|
void
|
|
dialogs_exit (Gimp *gimp)
|
|
{
|
|
if (global_dialog_factory)
|
|
{
|
|
g_object_unref (global_dialog_factory);
|
|
global_dialog_factory = NULL;
|
|
}
|
|
|
|
/* destroy the "global_toolbox_factory" _before_ destroying the
|
|
* "global_dock_factory" because the "global_toolbox_factory" owns
|
|
* dockables which were created by the "global_dock_factory". This
|
|
* way they are properly removed from the "global_dock_factory", which
|
|
* would complain about stale entries otherwise.
|
|
*/
|
|
if (global_toolbox_factory)
|
|
{
|
|
g_object_unref (global_toolbox_factory);
|
|
global_toolbox_factory = NULL;
|
|
}
|
|
|
|
if (global_dock_factory)
|
|
{
|
|
g_object_unref (global_dock_factory);
|
|
global_dock_factory = NULL;
|
|
}
|
|
}
|