Cleanup weekend...
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.
This commit is contained in:
Michael Natterer
committed by
Michael Natterer
Michael Natterer
parent
5e9fc1d8e4
commit
05e15eb1cc
@ -32,8 +32,9 @@
|
||||
|
||||
#include "libgimpwidgets/gimpwidgets.h"
|
||||
|
||||
#include "core/core-types.h"
|
||||
#include "gui-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpdrawable.h"
|
||||
#include "core/gimpimage.h"
|
||||
|
||||
@ -44,7 +45,6 @@
|
||||
#include "file-save-dialog.h"
|
||||
#include "menus.h"
|
||||
|
||||
#include "app_procs.h"
|
||||
#include "gimprc.h"
|
||||
#include "plug_in.h"
|
||||
#include "undo.h"
|
||||
@ -63,8 +63,8 @@ struct _OverwriteData
|
||||
|
||||
static void file_save_dialog_create (void);
|
||||
|
||||
static void file_overwrite (gchar *filename,
|
||||
gchar *raw_filename);
|
||||
static void file_overwrite (const gchar *filename,
|
||||
const gchar *raw_filename);
|
||||
static void file_overwrite_callback (GtkWidget *widget,
|
||||
gboolean overwrite,
|
||||
gpointer data);
|
||||
@ -88,15 +88,17 @@ static gboolean set_filename = TRUE;
|
||||
/* public functions */
|
||||
|
||||
void
|
||||
file_save_dialog_menu_init (void)
|
||||
file_save_dialog_menu_init (Gimp *gimp)
|
||||
{
|
||||
GimpItemFactoryEntry entry;
|
||||
PlugInProcDef *file_proc;
|
||||
GSList *list;
|
||||
|
||||
save_procs = g_slist_reverse (save_procs);
|
||||
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
||||
|
||||
for (list = save_procs; list; list = g_slist_next (list))
|
||||
gimp->save_procs = g_slist_reverse (gimp->save_procs);
|
||||
|
||||
for (list = gimp->save_procs; list; list = g_slist_next (list))
|
||||
{
|
||||
gchar *basename;
|
||||
gchar *filename;
|
||||
@ -143,6 +145,8 @@ file_save_dialog_show (GimpImage *gimage)
|
||||
{
|
||||
const gchar *filename;
|
||||
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
if (! gimp_image_active_drawable (gimage))
|
||||
return;
|
||||
|
||||
@ -150,7 +154,7 @@ file_save_dialog_show (GimpImage *gimage)
|
||||
|
||||
set_filename = TRUE;
|
||||
|
||||
filename = gimp_object_get_name (GIMP_OBJECT (the_gimage));
|
||||
filename = gimp_object_get_name (GIMP_OBJECT (gimage));
|
||||
|
||||
if (! filesave)
|
||||
file_save_dialog_create ();
|
||||
@ -169,22 +173,22 @@ file_save_dialog_show (GimpImage *gimage)
|
||||
switch (gimp_drawable_type (gimp_image_active_drawable (gimage)))
|
||||
{
|
||||
case RGB_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_RGB_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_RGB_IMAGE);
|
||||
break;
|
||||
case RGBA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_RGBA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_RGBA_IMAGE);
|
||||
break;
|
||||
case GRAY_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_GRAY_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_GRAY_IMAGE);
|
||||
break;
|
||||
case GRAYA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_GRAYA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_GRAYA_IMAGE);
|
||||
break;
|
||||
case INDEXED_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_INDEXED_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_INDEXED_IMAGE);
|
||||
break;
|
||||
case INDEXEDA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_INDEXEDA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_INDEXEDA_IMAGE);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -196,6 +200,8 @@ file_save_a_copy_dialog_show (GimpImage *gimage)
|
||||
{
|
||||
const gchar *filename;
|
||||
|
||||
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
||||
|
||||
if (! gimp_image_active_drawable (gimage))
|
||||
return;
|
||||
|
||||
@ -203,7 +209,7 @@ file_save_a_copy_dialog_show (GimpImage *gimage)
|
||||
|
||||
set_filename = FALSE;
|
||||
|
||||
filename = gimp_object_get_name (GIMP_OBJECT (the_gimage));
|
||||
filename = gimp_object_get_name (GIMP_OBJECT (gimage));
|
||||
|
||||
if (! filesave)
|
||||
file_save_dialog_create ();
|
||||
@ -222,22 +228,22 @@ file_save_a_copy_dialog_show (GimpImage *gimage)
|
||||
switch (gimp_drawable_type (gimp_image_active_drawable (gimage)))
|
||||
{
|
||||
case RGB_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_RGB_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_RGB_IMAGE);
|
||||
break;
|
||||
case RGBA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_RGBA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_RGBA_IMAGE);
|
||||
break;
|
||||
case GRAY_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_GRAY_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_GRAY_IMAGE);
|
||||
break;
|
||||
case GRAYA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_GRAYA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_GRAYA_IMAGE);
|
||||
break;
|
||||
case INDEXED_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_INDEXED_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_INDEXED_IMAGE);
|
||||
break;
|
||||
case INDEXEDA_GIMAGE:
|
||||
file_dialog_update_menus (save_procs, PLUG_IN_INDEXEDA_IMAGE);
|
||||
file_dialog_update_menus (gimage->gimp->save_procs, PLUG_IN_INDEXEDA_IMAGE);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -362,7 +368,8 @@ file_save_ok_callback (GtkWidget *widget,
|
||||
if (!the_drawable)
|
||||
return;
|
||||
|
||||
proc_rec = procedural_db_lookup (the_gimp, "plug_in_the_slimy_egg");
|
||||
proc_rec = procedural_db_lookup (the_gimage->gimp,
|
||||
"plug_in_the_slimy_egg");
|
||||
if (!proc_rec)
|
||||
break;
|
||||
|
||||
@ -404,36 +411,48 @@ file_save_ok_callback (GtkWidget *widget,
|
||||
else
|
||||
{
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (fs), FALSE);
|
||||
file_overwrite (g_strdup (filename), g_strdup (raw_filename));
|
||||
file_overwrite (filename, raw_filename);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GimpPDBStatusType status;
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (fs), FALSE);
|
||||
|
||||
if (file_save_with_proc (the_gimage,
|
||||
filename, raw_filename,
|
||||
save_file_proc,
|
||||
set_filename))
|
||||
status = file_save (the_gimage,
|
||||
filename,
|
||||
raw_filename,
|
||||
save_file_proc,
|
||||
RUN_INTERACTIVE,
|
||||
set_filename);
|
||||
|
||||
if (status != GIMP_PDB_SUCCESS &&
|
||||
status != GIMP_PDB_CANCEL)
|
||||
{
|
||||
file_dialog_hide (GTK_WIDGET (fs));
|
||||
g_message (_("Save failed:\n%s"), filename);
|
||||
}
|
||||
else
|
||||
{
|
||||
file_dialog_hide (GTK_WIDGET (fs));
|
||||
}
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (fs), TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
file_overwrite (gchar *filename,
|
||||
gchar *raw_filename)
|
||||
file_overwrite (const gchar *filename,
|
||||
const gchar *raw_filename)
|
||||
{
|
||||
OverwriteData *overwrite_data;
|
||||
GtkWidget *query_box;
|
||||
gchar *overwrite_text;
|
||||
|
||||
overwrite_data = g_new (OverwriteData, 1);
|
||||
overwrite_data->full_filename = filename;
|
||||
overwrite_data->raw_filename = raw_filename;
|
||||
overwrite_data = g_new0 (OverwriteData, 1);
|
||||
|
||||
overwrite_data->full_filename = g_strdup (filename);
|
||||
overwrite_data->raw_filename = g_strdup (raw_filename);
|
||||
|
||||
overwrite_text = g_strdup_printf (_("%s exists, overwrite?"), filename);
|
||||
|
||||
@ -463,11 +482,21 @@ file_overwrite_callback (GtkWidget *widget,
|
||||
|
||||
if (overwrite)
|
||||
{
|
||||
if (file_save_with_proc (the_gimage,
|
||||
overwrite_data->full_filename,
|
||||
overwrite_data->raw_filename,
|
||||
save_file_proc,
|
||||
set_filename))
|
||||
GimpPDBStatusType status;
|
||||
|
||||
status = file_save (the_gimage,
|
||||
overwrite_data->full_filename,
|
||||
overwrite_data->raw_filename,
|
||||
save_file_proc,
|
||||
RUN_INTERACTIVE,
|
||||
set_filename);
|
||||
|
||||
if (status != GIMP_PDB_SUCCESS &&
|
||||
status != GIMP_PDB_CANCEL)
|
||||
{
|
||||
g_message (_("Save failed:\n%s"), overwrite_data->full_filename);
|
||||
}
|
||||
else
|
||||
{
|
||||
file_dialog_hide (GTK_WIDGET (filesave));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user