
2001-10-29 Michael Natterer <mitch@gimp.org> Cleanup weekend... * app/app_procs.c: pass "no_interface" to gimp_new(). * app/core/gimp.[ch]: added "gboolean no_interface" and the load_procs and save_procs GSLists. * app/core/gimptoolinfo.[ch]: added a "Gimp" pointer to the GimpToolInfo object so more functions find their context without accessing the global "the_gimp" variable. * app/display/display-types.h: removed the GDisplay -> GimpDisplay typedef. * app/display/gimpdisplay.c: look at gimp->no_interface, don't include "appenv.h". * app/file/file-open.[ch] * app/file/file-save.[ch]: don't use "the_gimp" any more. Instead, pass around lots of "Gimp" pointers. Removed the global load_procs and save_procs variables here. Use access() to find out whether a file is readable/writable, removed the manual voodoo and it's Win32 wrappers. Added an optional (can be NULL) "PlunInProcDef" parameter to file_save(), removed file_save_with_proc(). * app/gui/menus.c: Use the unused "gpointer data" parameter of the GtkItemFactory callbacks to pass a "Gimp" pointer to all of them. This reduces the usage of the global "the_gimp" hack to zero in app/gui/... yeah. * app/gui/channels-commands.c * app/gui/edit-commands.c * app/gui/file-commands.c * app/gui/image-commands.c * app/gui/layers-commands.c * app/gui/palettes-commands.c * app/gui/select-commands.c * app/gui/test-commands.c * app/gui/tools-commands.c * app/gui/view-commands.c: use the passed "Gimp" pointer. * app/gui/color-area.[ch] * app/gui/convert-dialog.c * app/gui/dialogs-constructors.c * app/gui/file-new-dialog.[ch] * app/gui/file-open-dialog.[ch] * app/gui/file-save-dialog.[ch] * app/gui/gui.c * app/gui/info-window.[ch] * app/gui/module-browser.[ch] * app/gui/palette-editor.c * app/gui/palette-import-dialog.[ch] * app/gui/paths-dialog.c * app/gui/preferences-dialog.[ch] * app/gui/resize-dialog.[ch] * app/gui/tool-options-dialog.[ch] * app/gui/toolbox.c: pass around lots more "Gimp" and "GimpContext" pointers and don't use "the_gimp" any more. * app/tools/gimptool.h: added a pointer to the corresponding GimpToolInfo object (which in turn has a pointer to a Gimp). * app/tools/tool_manager.[ch]: set the pointer after creating the tool object. Removed tool_manager_get_info_by_tool() as there is a tool->tool_info pointer now. * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpclonetool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpcurvestool.c * app/tools/gimpdodgeburntool.c * app/tools/gimpdrawtool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpellipseselecttool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimphistogramtool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpinktool.c * app/tools/gimplevelstool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimpperspectivetool.c * app/tools/gimpposterizetool.c * app/tools/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpscaletool.c * app/tools/gimpsheartool.c * app/tools/gimptexttool.c * app/tools/gimpthresholdtool.c * app/tools/path_tool.c * app/tools/xinput_airbrush.c: s/GDisplay/GimpDisplay/g. Use tool->tool_info and tool_info->gimp in some places to get rid of using "the_gimp". Removing the remaining ones involves changing the tool options system and is scheduled next... * app/widgets/gimpdnd.c * app/widgets/gimpdocumentview.c: pass a "Gimp" pointer to all file_open_*() functions. * app/gdisplay_color.[ch] * app/gdisplay_color_ui.[ch] * app/image_map.[ch] * app/nav_window.[ch] * app/path.c * app/path_bezier.c * app/path_transform.h * app/qmask.[ch]: s/GDisplay/GimpDisplay/g * tools/pdbgen/pdb/fileops.pdb: load_procs and save_procs are members of the "Gimp" object now. * tools/pdbgen/pdb/plug_in.pdb: use gimp->no_interface, don't include "appenv.h". * app/pdb/fileops_cmds.c * app/pdb/plug_in_cmds.c: regenerated.
292 lines
7.7 KiB
C
292 lines
7.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 "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "core/core-types.h"
|
|
#include "tools/tools-types.h"
|
|
#include "widgets/widgets-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpchannel.h"
|
|
#include "core/gimpcontainer.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpdatafactory.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimplayer.h"
|
|
|
|
#include "widgets/gimpcontainerlistview.h"
|
|
#include "widgets/gimpcontainergridview.h"
|
|
#include "widgets/gimpcontainermenuimpl.h"
|
|
#include "widgets/gimpdatafactoryview.h"
|
|
#include "widgets/gimpdialogfactory.h"
|
|
#include "widgets/gimpdock.h"
|
|
#include "widgets/gimpimagedock.h"
|
|
#include "widgets/gimpdockable.h"
|
|
#include "widgets/gimpdockbook.h"
|
|
#include "widgets/gimpdrawablelistview.h"
|
|
#include "widgets/gimppreview.h"
|
|
|
|
#include "tools/tool_manager.h"
|
|
|
|
#include "dialogs.h"
|
|
#include "gradient-editor.h"
|
|
|
|
#include "gimprc.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
/***** Container View Test Dialogs *****/
|
|
|
|
static void
|
|
container_view_scale_callback (GtkAdjustment *adj,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_preview_size (view, ROUND (adj->value));
|
|
}
|
|
|
|
static void
|
|
brushes_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, view->context->gimp->brush_factory->container);
|
|
}
|
|
|
|
static void
|
|
patterns_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, view->context->gimp->pattern_factory->container);
|
|
}
|
|
|
|
static void
|
|
gradients_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, view->context->gimp->gradient_factory->container);
|
|
}
|
|
|
|
static void
|
|
palettes_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, view->context->gimp->palette_factory->container);
|
|
}
|
|
|
|
static void
|
|
images_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, view->context->gimp->images);
|
|
}
|
|
|
|
/*
|
|
static void
|
|
null_callback (GtkWidget *widget,
|
|
GimpContainerView *view)
|
|
{
|
|
gimp_container_view_set_container (view, NULL);
|
|
}
|
|
*/
|
|
|
|
static void
|
|
container_multi_view_new (gboolean list,
|
|
gchar *title,
|
|
GimpContainer *container,
|
|
GimpContext *context,
|
|
gint preview_size)
|
|
{
|
|
GtkWidget *dialog;
|
|
GtkWidget *view;
|
|
GtkObject *adjustment;
|
|
GtkWidget *scale;
|
|
GtkWidget *preview;
|
|
|
|
if (list)
|
|
{
|
|
view = gimp_container_list_view_new (container,
|
|
context,
|
|
preview_size,
|
|
FALSE,
|
|
5, 5);
|
|
}
|
|
else
|
|
{
|
|
view = gimp_container_grid_view_new (container,
|
|
context,
|
|
preview_size,
|
|
FALSE,
|
|
5, 5);
|
|
}
|
|
|
|
dialog = gimp_dialog_new (title, "test",
|
|
gimp_standard_help_func,
|
|
NULL,
|
|
GTK_WIN_POS_MOUSE,
|
|
FALSE, TRUE, TRUE,
|
|
|
|
"Images", images_callback,
|
|
view, NULL, NULL, FALSE, FALSE,
|
|
|
|
/*
|
|
"NULL", null_callback,
|
|
view, NULL, NULL, FALSE, FALSE,
|
|
*/
|
|
|
|
"_delete_event_", gtk_widget_destroy,
|
|
NULL, 1, NULL, FALSE, TRUE,
|
|
|
|
NULL);
|
|
|
|
preview =
|
|
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_brush (context)),
|
|
32, 32, 1,
|
|
FALSE, TRUE, FALSE);
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), preview,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (preview);
|
|
|
|
g_signal_connect (G_OBJECT (preview), "clicked",
|
|
G_CALLBACK (brushes_callback),
|
|
view);
|
|
|
|
g_signal_connect_object (G_OBJECT (context), "brush_changed",
|
|
G_CALLBACK (gimp_preview_set_viewable),
|
|
G_OBJECT (preview),
|
|
G_CONNECT_SWAPPED);
|
|
|
|
preview =
|
|
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_pattern (context)),
|
|
32, 32, 1,
|
|
FALSE, TRUE, FALSE);
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), preview,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (preview);
|
|
|
|
g_signal_connect (G_OBJECT (preview), "clicked",
|
|
G_CALLBACK (patterns_callback),
|
|
view);
|
|
|
|
g_signal_connect_object (G_OBJECT (context), "pattern_changed",
|
|
G_CALLBACK (gimp_preview_set_viewable),
|
|
G_OBJECT (preview),
|
|
G_CONNECT_SWAPPED);
|
|
|
|
preview =
|
|
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_gradient (context)),
|
|
32, 32, 1,
|
|
FALSE, TRUE, FALSE);
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), preview,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (preview);
|
|
|
|
g_signal_connect (G_OBJECT (preview), "clicked",
|
|
G_CALLBACK (gradients_callback),
|
|
view);
|
|
|
|
g_signal_connect_object (G_OBJECT (context), "gradient_changed",
|
|
G_CALLBACK (gimp_preview_set_viewable),
|
|
G_OBJECT (preview),
|
|
G_CONNECT_SWAPPED);
|
|
|
|
preview =
|
|
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_palette (context)),
|
|
32, 32, 1,
|
|
FALSE, TRUE, FALSE);
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), preview,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (preview);
|
|
|
|
g_signal_connect (G_OBJECT (preview), "clicked",
|
|
G_CALLBACK (palettes_callback),
|
|
view);
|
|
|
|
g_signal_connect_object (G_OBJECT (context), "palette_changed",
|
|
G_CALLBACK (gimp_preview_set_viewable),
|
|
G_OBJECT (preview),
|
|
G_CONNECT_SWAPPED);
|
|
|
|
#if 0
|
|
preview =
|
|
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_image (context)),
|
|
32, 32, 1,
|
|
FALSE, TRUE, FALSE);
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), preview,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (preview);
|
|
|
|
g_signal_connect (G_OBJECT (preview), "clicked",
|
|
G_CALLBACK (images_callback),
|
|
view);
|
|
|
|
g_signal_connect_object (G_OBJECT (context), "pattern_changed",
|
|
G_CALLBACK (gimp_preview_set_viewable),
|
|
G_OBJECT (preview),
|
|
G_CONNECT_SWAPPED);
|
|
#endif
|
|
|
|
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), view);
|
|
gtk_widget_show (view);
|
|
|
|
adjustment = gtk_adjustment_new (preview_size, 16, 64, 4, 4, 0);
|
|
scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment));
|
|
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scale,
|
|
FALSE, FALSE, 0);
|
|
gtk_widget_show (scale);
|
|
|
|
g_signal_connect (G_OBJECT (adjustment), "value_changed",
|
|
G_CALLBACK (container_view_scale_callback),
|
|
view);
|
|
|
|
gtk_widget_show (dialog);
|
|
}
|
|
|
|
void
|
|
test_multi_container_list_view_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
Gimp *gimp;
|
|
|
|
gimp = GIMP (data);
|
|
|
|
container_multi_view_new (TRUE, "Multi List",
|
|
gimp->brush_factory->container,
|
|
gimp_get_user_context (gimp),
|
|
24);
|
|
}
|
|
|
|
void
|
|
test_multi_container_grid_view_cmd_callback (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
Gimp *gimp;
|
|
|
|
gimp = GIMP (data);
|
|
|
|
container_multi_view_new (FALSE, "Multi Grid",
|
|
gimp->brush_factory->container,
|
|
gimp_get_user_context (gimp),
|
|
32);
|
|
}
|