b879840890
2002-03-14 Michael Natterer <mitch@gimp.org> * app/core/gimptoolinfo.c: g_strdup() the stock_id passed to gimp_tool_info_new() because the caller's memory may disappear after registering the tool (tool modules). Made a GimpDock out of the toolbox: * app/gui/Makefile.am * app/gui/color-area.[ch] * app/gui/indicator-area.[ch] * app/gui/toolbox.[ch]: removed... * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimptoolbox-color-area.[ch] * app/widgets/gimptoolbox-indicator-area.[ch] * app/widgets/gimptoolbox.[ch]: ...and added here. * app/widgets/gimpdock.[ch]: don't set a minimal width. Added a "destroy_if_empty" boolean so we can prevent destruction of the toolbox if it's last dockable is removed. Added gimp_dock_construct() which is called from GimpImageDock and GimpToolbox. * app/widgets/gimpimagedock.[ch]: Default to not showing the image menu, set a minimal width here, misc. minor cleanup. * app/widgets/gimpdockbook.c: some more GIMP_IS_IMAGE_DOCK() checks, fixed dnd widget creation. * app/widgets/gimpdialogfactory.[ch]: changed gimp_dialog_factories_toggle() to take just the toolbox_factory as parameter. When restoring the session use the created dock's dialog factory to create dockables, not the the factory we created the dock from (for the toolbox). * app/display/gimpdisplayshell-callbacks.c: changed accordingly. * app/gui/dialogs.[ch]: create an own dialog factory for the toolbox and set dialogs_toolbox_new() as it's new_dock_func. * app/gui/dialogs-constructors.[ch]: changed dialogs_toolbox_get() accordingly. * app/gui/dialogs-commands.[ch]: added dialogs_show_toolbox(), ckeck if a dock is really a GimpImageDock before casting. * app/gui/gui.c * app/gui/menus.c * app/widgets/gimppaletteeditor.c: changed accordingly. * app/gui/color-notebook.c * app/gui/color-select.c * app/gui/colormap-dialog.c * app/gui/palette-editor-commands.c: removed useless inclusion of "gui/color-area.h". * themes/Default/gtkrc: set "gimp-dock-style" for GimpToolbox widgets.
80 lines
2.7 KiB
C
80 lines
2.7 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpdock.h
|
|
* Copyright (C) 2001 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.
|
|
*/
|
|
|
|
#ifndef __GIMP_DOCK_H__
|
|
#define __GIMP_DOCK_H__
|
|
|
|
|
|
#include <gtk/gtkwindow.h>
|
|
|
|
|
|
#define GIMP_TYPE_DOCK (gimp_dock_get_type ())
|
|
#define GIMP_DOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK, GimpDock))
|
|
#define GIMP_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK, GimpDockClass))
|
|
#define GIMP_IS_DOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK))
|
|
#define GIMP_IS_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DOCK))
|
|
#define GIMP_DOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK, GimpDockClass))
|
|
|
|
|
|
typedef struct _GimpDockClass GimpDockClass;
|
|
|
|
struct _GimpDock
|
|
{
|
|
GtkWindow parent_instance;
|
|
|
|
GimpDialogFactory *dialog_factory;
|
|
GimpContext *context;
|
|
gboolean destroy_if_empty;
|
|
|
|
GtkWidget *main_vbox;
|
|
GtkWidget *vbox;
|
|
|
|
GList *dockbooks;
|
|
};
|
|
|
|
struct _GimpDockClass
|
|
{
|
|
GtkWindowClass parent_class;
|
|
};
|
|
|
|
|
|
GType gimp_dock_get_type (void) G_GNUC_CONST;
|
|
|
|
gboolean gimp_dock_construct (GimpDock *dock,
|
|
GimpDialogFactory *dialog_factory,
|
|
GimpContext *context,
|
|
gboolean destroy_if_empty);
|
|
|
|
void gimp_dock_add (GimpDock *dock,
|
|
GimpDockable *dockable,
|
|
gint book,
|
|
gint index);
|
|
void gimp_dock_remove (GimpDock *dock,
|
|
GimpDockable *dockable);
|
|
|
|
void gimp_dock_add_book (GimpDock *dock,
|
|
GimpDockbook *dockbook,
|
|
gint index);
|
|
void gimp_dock_remove_book (GimpDock *dock,
|
|
GimpDockbook *dockbook);
|
|
|
|
|
|
#endif /* __GIMP_DOCK_H__ */
|