8d86ec25e0
2003-01-10 Michael Natterer <mitch@gimp.org> Move away from creating all item_factories statically in menus_init() but create a new one for each place where one is needed: * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimpmenufactory.[ch]: new factory which creates and configures the GimpItemFactories it knows about on-the-fly. * app/widgets/gimpitemfactory.[ch]: added gimp_item_factory_update() which calls the "update_func". Added "gboolean update_on_popup" so item_factories can be configured to require manual updates (used for the <Image> factory). * app/gui/menus.[ch]: create a "global_menu_factory" and register all menus we have with it. Added various setup functions which do stuff like adding the "Open Recent" menu or reorder plug-in menu entries. Removed the debugging stuff... * app/gui/Makefile.am * app/gui/debug-commands.[ch]: ...and added it here. * app/gui/gui.c: create the <Toolbox>, the popup-<Image> and the <Paths> factories here because they are still global. * app/gui/plug-in-menus.[ch]: changed the "image_factory" parameters to "item_factory" and create/update the entries for the passed item_factory only. Makes the whole stuff much more straightforward. * app/plug-in/plug-ins.c: don't call plug_in_make_menu(). * app/display/gimpdisplay.[ch] * app/display/gimpdisplayshell.[ch]: added "menu_factory" and "popup_factory" parameters to gimp_display_new() and gimp_display_shell_new(). Create the menubar_factory and the qmask_factory dynamically. Pass the shell, not a Gimp to the QMask callbacks. Changed gimp_display_shell_set_menu_sensitivity() to gimp_display_shell_menu_update() and don't call it directly (it's a GimpItemFactory update_func now). Call gimp_item_factory_update() on the resp. factories instead. * app/gui/qmask-commands.c * app/display/gimpdisplayshell-callbacks.c * app/tools/gimpimagemaptool.c: changed accordingly. * app/widgets/gimpbrusheditor.c * app/widgets/gimpbrushfactoryview.[ch] * app/widgets/gimpbufferview.[ch] * app/widgets/gimpcolormapeditor.[ch] * app/widgets/gimpcontainereditor.[ch] * app/widgets/gimpdataeditor.[ch] * app/widgets/gimpdatafactoryview.[ch] * app/widgets/gimpdialogfactory.[ch] * app/widgets/gimpdock.c * app/widgets/gimpdockbook.[ch] * app/widgets/gimpdocumentview.[ch] * app/widgets/gimpgradienteditor.[ch] * app/widgets/gimpimageview.[ch] * app/widgets/gimpitemlistview.[ch] * app/widgets/gimppaletteeditor.[ch]: pass around lots of GimpMenuFactory pointers and menu_identifiers so all views can create their item_factories themselves. Unref the factories when they are no longer needed because they belong to the views now. * app/gui/dialogs-commands.c * app/gui/dialogs-constructors.c * app/gui/dialogs.c * app/gui/brush-select.c * app/gui/gradient-select.c * app/gui/palette-select.c * app/gui/pattern-select.c: changed accordingly. * app/gui/file-dialog-utils.[ch] (file_dialog_new): require menu_factory and menu_identifier parameters. * app/gui/file-open-dialog.[ch] * app/gui/file-save-dialog.[ch]: removed file_*_dialog_menu_init() (they went to menus.c as setup_funcs). Added file_*_dialog_set_type() and moved the <Load> and <Save> factory callbacks to file-commands.c * app/gui/file-commands.[ch]: changed accordingly. * app/gui/view-commands.c: changed the statusbar, menubar, rulers and guides callbacks to do their job only if the setting has actually changed. Don't update whole item factories afterwards. Instead, just change the state of the items that actually need update. Unrelated: * app/core/gimpchannel.c (gimp_channel_init): set "bounds_known" and friends to FALSE since we don't know that the new channel will be empty (fixes QMask and probably other stuff). * app/gui/image-commands.c * app/gui/vectors-commands.c: cleanup.
120 lines
4.8 KiB
C
120 lines
4.8 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 __WIDGETS_TYPES_H__
|
|
#define __WIDGETS_TYPES_H__
|
|
|
|
|
|
#include "libgimpwidgets/gimpwidgetstypes.h"
|
|
|
|
#include "core/core-types.h"
|
|
|
|
#include "widgets/widgets-enums.h"
|
|
|
|
|
|
/* non-widget objects */
|
|
|
|
typedef struct _GimpDeviceInfo GimpDeviceInfo;
|
|
typedef struct _GimpDialogFactory GimpDialogFactory;
|
|
typedef struct _GimpItemFactory GimpItemFactory;
|
|
typedef struct _GimpMenuFactory GimpMenuFactory;
|
|
|
|
|
|
/* widgets */
|
|
|
|
typedef struct _GimpPreview GimpPreview;
|
|
typedef struct _GimpImagePreview GimpImagePreview;
|
|
typedef struct _GimpDrawablePreview GimpDrawablePreview;
|
|
typedef struct _GimpImagefilePreview GimpImagefilePreview;
|
|
typedef struct _GimpBrushPreview GimpBrushPreview;
|
|
typedef struct _GimpNavigationPreview GimpNavigationPreview;
|
|
typedef struct _GimpPatternPreview GimpPatternPreview;
|
|
typedef struct _GimpPalettePreview GimpPalettePreview;
|
|
typedef struct _GimpGradientPreview GimpGradientPreview;
|
|
typedef struct _GimpToolInfoPreview GimpToolInfoPreview;
|
|
typedef struct _GimpBufferPreview GimpBufferPreview;
|
|
|
|
typedef struct _GimpContainerMenu GimpContainerMenu;
|
|
typedef struct _GimpContainerMenuImpl GimpContainerMenuImpl;
|
|
|
|
typedef struct _GimpMenuItem GimpMenuItem;
|
|
typedef struct _GimpEnumMenu GimpEnumMenu;
|
|
|
|
typedef struct _GimpEditor GimpEditor;
|
|
typedef struct _GimpColorEditor GimpColorEditor;
|
|
typedef struct _GimpColormapEditor GimpColormapEditor;
|
|
typedef struct _GimpDataEditor GimpDataEditor;
|
|
typedef struct _GimpBrushEditor GimpBrushEditor;
|
|
typedef struct _GimpGradientEditor GimpGradientEditor;
|
|
typedef struct _GimpPaletteEditor GimpPaletteEditor;
|
|
typedef struct _GimpSelectionEditor GimpSelectionEditor;
|
|
|
|
typedef struct _GimpContainerView GimpContainerView;
|
|
typedef struct _GimpContainerListView GimpContainerListView;
|
|
typedef struct _GimpContainerGridView GimpContainerGridView;
|
|
|
|
typedef struct _GimpItemListView GimpItemListView;
|
|
typedef struct _GimpDrawableListView GimpDrawableListView;
|
|
typedef struct _GimpLayerListView GimpLayerListView;
|
|
typedef struct _GimpChannelListView GimpChannelListView;
|
|
typedef struct _GimpVectorsListView GimpVectorsListView;
|
|
|
|
typedef struct _GimpContainerEditor GimpContainerEditor;
|
|
typedef struct _GimpBufferView GimpBufferView;
|
|
typedef struct _GimpDocumentView GimpDocumentView;
|
|
typedef struct _GimpImageView GimpImageView;
|
|
typedef struct _GimpDataFactoryView GimpDataFactoryView;
|
|
typedef struct _GimpBrushFactoryView GimpBrushFactoryView;
|
|
|
|
typedef struct _GimpListItem GimpListItem;
|
|
typedef struct _GimpItemListItem GimpItemListItem;
|
|
typedef struct _GimpChannelListItem GimpChannelListItem;
|
|
typedef struct _GimpDrawableListItem GimpDrawableListItem;
|
|
typedef struct _GimpLayerListItem GimpLayerListItem;
|
|
typedef struct _GimpComponentListItem GimpComponentListItem;
|
|
|
|
typedef struct _GimpDock GimpDock;
|
|
typedef struct _GimpToolbox GimpToolbox;
|
|
typedef struct _GimpImageDock GimpImageDock;
|
|
typedef struct _GimpDockable GimpDockable;
|
|
typedef struct _GimpDockbook GimpDockbook;
|
|
|
|
typedef struct _GimpViewableDialog GimpViewableDialog;
|
|
|
|
typedef struct _GimpFontSelection GimpFontSelection;
|
|
typedef struct _GimpFontSelectionDialog GimpFontSelectionDialog;
|
|
|
|
typedef struct _GimpHistogramView GimpHistogramView;
|
|
typedef struct _GimpHistogramBox GimpHistogramBox;
|
|
|
|
|
|
/* structs */
|
|
|
|
typedef struct _GimpItemFactoryEntry GimpItemFactoryEntry;
|
|
|
|
|
|
/* function types */
|
|
|
|
typedef void (* GimpItemFactorySetupFunc) (GimpItemFactory *factory);
|
|
typedef void (* GimpItemFactoryUpdateFunc) (GtkItemFactory *factory,
|
|
gpointer data);
|
|
typedef gchar * (* GimpItemGetNameFunc) (GtkWidget *widget,
|
|
gchar **tooltip);
|
|
|
|
|
|
#endif /* __WIDGETS_TYPES_H__ */
|