mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 04:22:29 +00:00
f5afb754a5
2006-10-09 Michael Natterer <mitch@gimp.org> Added message severities and make sure all messages are routed through a central function, so redirecting to the error console or stderr work again: * app/core/core-enums.[ch]: added enum GimpMessageSeverity { INFO, WARNING, ERROR }. * app/core/gimp.[ch] (gimp_message) (gimp_message_valist): added severity parameter. Changed "GimpProgress *progress" parameter to "GObject *handler", where "handler" can be either a GimpProgress, a GtkWidget or NULL. * app/core/gimp-gui.[ch] (gimp_show_message): ditto. Honor --console-messages again. Always dispatch to the GUI message handler first if it exists. * app/gui/gui-message.[ch]: pass severity parameters around. (gui_message_error_dialog): if "handler" is a progress, dispatch the message to it first. If it is a widget (and *not* a progress), use a GtkMessageDialog on top of that widget's toplevel. Fall back to the usual GimpErrorDialog otherwise. * app/core/gimpprogress.[ch] (gimp_progress_message): added severity parameter. Also added boolean return value to the virtual function so it can decide to fail if it can't handle the message. * app/display/gimpdisplay.c: implement GimpProgress::message() and redirect the message to GimpDisplayShell. * app/display/gimpdisplayshell-progress.c: implement GimpProgress::message() and redirect the message to GimpStatusbar if it is not an error and if the status bar is visible. * app/display/gimpstatusbar.[ch]: implement GimpProgress::message(), but fail on messages that contain a newline. Show the right icons for the message severities (work in progress). * app/display/gimpdisplayshell.[ch]: removed gimp_display_shell_message() and its _valist() variant. * app/widgets/gimperrorconsole.[ch]: show the right icons for the message severities. * app/widgets/gimpthumbbox.c (gimp_thumb_box_progress_message): return TRUE to swallow all messages. * app/widgets/gimpwidgets-utils.[ch]: removed gimp_show_message_dialog(). Added gimp_get_message_stock_id(). * app/errors.c * app/actions/edit-commands.c * app/actions/error-console-commands.c * app/actions/file-commands.c * app/actions/select-commands.c * app/actions/text-editor-commands.c * app/actions/vectors-commands.c * app/core/gimpimage-convert.c * app/core/gimpimagefile.c * app/dialogs/convert-dialog.c * app/dialogs/file-open-dialog.c * app/dialogs/file-open-location-dialog.c * app/dialogs/file-save-dialog.c * app/dialogs/palette-import-dialog.c * app/dialogs/stroke-dialog.c * app/display/gimpdisplayshell-dnd.c * app/pdb/gimppdb.c * app/plug-in/gimpplugin.c * app/tools/gimpimagemaptool.c * app/tools/gimptool.c * app/tools/gimpvectortool.c * app/widgets/gimpactionview.c * app/widgets/gimpcontrollerlist.c * app/widgets/gimppdbdialog.c * app/widgets/gimpvectorstreeview.c * app/xcf/xcf-load.c * app/xcf/xcf-save.c * app/xcf/xcf.c * tools/pdbgen/pdb/brush.pdb * tools/pdbgen/pdb/gradient.pdb * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/message.pdb * tools/pdbgen/pdb/palette.pdb: added severity parameter to gimp_message() calls. Convert all calls to gimp_show_message_dialog() and gimp_display_shell_message() to gimp_message(). Also converted some more g_message() calls. * app/pdb/brush_cmds.c * app/pdb/gradient_cmds.c * app/pdb/image_cmds.c * app/pdb/message_cmds.c * app/pdb/palette_cmds.c: regenerated.
263 lines
7.9 KiB
C
263 lines
7.9 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995, 1996, 1997 Spencer Kimball and Peter Mattis
|
|
* Copyright (C) 1997 Josh MacDonald
|
|
*
|
|
* 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 <string.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "dialogs-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpitem.h"
|
|
#include "core/gimpprogress.h"
|
|
|
|
#include "file/file-open.h"
|
|
#include "file/file-utils.h"
|
|
|
|
#include "widgets/gimpfiledialog.h"
|
|
#include "widgets/gimphelp-ids.h"
|
|
|
|
#include "file-open-dialog.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void file_open_dialog_response (GtkWidget *open_dialog,
|
|
gint response_id,
|
|
Gimp *gimp);
|
|
static gboolean file_open_dialog_open_image (GtkWidget *open_dialog,
|
|
Gimp *gimp,
|
|
const gchar *uri,
|
|
const gchar *entered_filename,
|
|
GimpPlugInProcedure *load_proc);
|
|
static gboolean file_open_dialog_open_layer (GtkWidget *open_dialog,
|
|
GimpImage *image,
|
|
const gchar *uri,
|
|
const gchar *entered_filename,
|
|
GimpPlugInProcedure *load_proc);
|
|
|
|
|
|
/* public functions */
|
|
|
|
GtkWidget *
|
|
file_open_dialog_new (Gimp *gimp)
|
|
{
|
|
GtkWidget *dialog;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
dialog = gimp_file_dialog_new (gimp,
|
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
|
_("Open Image"), "gimp-file-open",
|
|
GTK_STOCK_OPEN,
|
|
GIMP_HELP_FILE_OPEN);
|
|
|
|
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
|
|
|
|
g_signal_connect (dialog, "response",
|
|
G_CALLBACK (file_open_dialog_response),
|
|
gimp);
|
|
|
|
return dialog;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
file_open_dialog_response (GtkWidget *open_dialog,
|
|
gint response_id,
|
|
Gimp *gimp)
|
|
{
|
|
GimpFileDialog *dialog = GIMP_FILE_DIALOG (open_dialog);
|
|
GSList *uris;
|
|
GSList *list;
|
|
gboolean success = FALSE;
|
|
|
|
if (response_id != GTK_RESPONSE_OK)
|
|
{
|
|
if (! dialog->busy)
|
|
gtk_widget_hide (open_dialog);
|
|
|
|
return;
|
|
}
|
|
|
|
uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (open_dialog));
|
|
|
|
gimp_file_dialog_set_sensitive (dialog, FALSE);
|
|
|
|
/* open layers in reverse order so they appear in the same
|
|
* order as in the file dialog
|
|
*/
|
|
if (dialog->image)
|
|
uris = g_slist_reverse (uris);
|
|
|
|
for (list = uris; list; list = g_slist_next (list))
|
|
{
|
|
gchar *filename = file_utils_filename_from_uri (list->data);
|
|
|
|
if (filename)
|
|
{
|
|
gboolean regular = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
|
|
|
|
g_free (filename);
|
|
|
|
if (! regular)
|
|
continue;
|
|
}
|
|
|
|
if (dialog->image)
|
|
{
|
|
if (file_open_dialog_open_layer (open_dialog,
|
|
dialog->image,
|
|
list->data,
|
|
list->data,
|
|
dialog->file_proc))
|
|
{
|
|
success = TRUE;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (file_open_dialog_open_image (open_dialog,
|
|
gimp,
|
|
list->data,
|
|
list->data,
|
|
dialog->file_proc))
|
|
{
|
|
success = TRUE;
|
|
|
|
gdk_window_raise (open_dialog->window);
|
|
}
|
|
}
|
|
|
|
if (dialog->canceled)
|
|
break;
|
|
}
|
|
|
|
if (success)
|
|
{
|
|
gtk_widget_hide (open_dialog);
|
|
|
|
if (dialog->image)
|
|
gimp_image_flush (dialog->image);
|
|
}
|
|
|
|
gimp_file_dialog_set_sensitive (dialog, TRUE);
|
|
|
|
g_slist_foreach (uris, (GFunc) g_free, NULL);
|
|
g_slist_free (uris);
|
|
}
|
|
|
|
static gboolean
|
|
file_open_dialog_open_image (GtkWidget *open_dialog,
|
|
Gimp *gimp,
|
|
const gchar *uri,
|
|
const gchar *entered_filename,
|
|
GimpPlugInProcedure *load_proc)
|
|
{
|
|
GimpImage *image;
|
|
GimpPDBStatusType status;
|
|
GError *error = NULL;
|
|
|
|
image = file_open_with_proc_and_display (gimp,
|
|
gimp_get_user_context (gimp),
|
|
GIMP_PROGRESS (open_dialog),
|
|
uri,
|
|
entered_filename,
|
|
load_proc,
|
|
&status,
|
|
&error);
|
|
|
|
if (image)
|
|
{
|
|
return TRUE;
|
|
}
|
|
else if (status != GIMP_PDB_CANCEL)
|
|
{
|
|
gchar *filename = file_utils_uri_display_name (uri);
|
|
|
|
gimp_message (gimp, G_OBJECT (open_dialog), GIMP_MESSAGE_ERROR,
|
|
_("Opening '%s' failed:\n\n%s"), filename, error->message);
|
|
g_clear_error (&error);
|
|
|
|
g_free (filename);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static gboolean
|
|
file_open_dialog_open_layer (GtkWidget *open_dialog,
|
|
GimpImage *image,
|
|
const gchar *uri,
|
|
const gchar *entered_filename,
|
|
GimpPlugInProcedure *load_proc)
|
|
{
|
|
GimpLayer *new_layer;
|
|
GimpPDBStatusType status;
|
|
GError *error = NULL;
|
|
|
|
new_layer = file_open_layer (image->gimp,
|
|
gimp_get_user_context (image->gimp),
|
|
GIMP_PROGRESS (open_dialog),
|
|
image, uri, GIMP_RUN_INTERACTIVE, load_proc,
|
|
&status, &error);
|
|
|
|
if (new_layer)
|
|
{
|
|
GimpItem *new_item = GIMP_ITEM (new_layer);
|
|
gint width, height;
|
|
gint off_x, off_y;
|
|
|
|
width = gimp_image_get_width (image);
|
|
height = gimp_image_get_height (image);
|
|
|
|
gimp_item_offsets (new_item, &off_x, &off_y);
|
|
|
|
off_x = (width - gimp_item_width (new_item)) / 2 - off_x;
|
|
off_y = (height - gimp_item_height (new_item)) / 2 - off_y;
|
|
|
|
gimp_item_translate (new_item, off_x, off_y, FALSE);
|
|
|
|
gimp_image_add_layer (image, new_layer, -1);
|
|
|
|
return TRUE;
|
|
}
|
|
else if (status != GIMP_PDB_CANCEL)
|
|
{
|
|
gchar *filename = file_utils_uri_display_name (uri);
|
|
|
|
gimp_message (image->gimp, G_OBJECT (open_dialog), GIMP_MESSAGE_ERROR,
|
|
_("Opening '%s' failed:\n\n%s"), filename, error->message);
|
|
g_clear_error (&error);
|
|
|
|
g_free (filename);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|