callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/display/Makefile.am new files for gimp_display_shell_close() and its

Browse Source 
2004-07-14  Michael Natterer  <mitch@gimp.org>

	* app/display/Makefile.am
	* app/display/gimpdisplayshell-close.[ch]: new files for
	gimp_display_shell_close() and its dialog & callback.

	* app/display/gimpdisplayshell.[ch]: removed from here.

	* app/actions/view-actions.c (view_close_view_cmd_callback):
	changed accordingly.
This commit is contained in:
Michael Natterer
2004-07-14 00:15:57 +00:00
committed by Michael Natterer
parent 4d91ca54d3
commit 2226ddf7e4
7 changed files with 240 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2004-07-14 Michael Natterer <mitch@gimp.org>
* app/display/Makefile.am
* app/display/gimpdisplayshell-close.[ch]: new files for
gimp_display_shell_close() and its dialog & callback.
* app/display/gimpdisplayshell.[ch]: removed from here.
* app/actions/view-actions.c (view_close_view_cmd_callback):
changed accordingly.
2004-07-14 Sven Neumann <sven@gimp.org> 2004-07-14 Sven Neumann <sven@gimp.org>
* plug-ins/pagecurl/pagecurl.c: code cleanup. Use enums instead of * plug-ins/pagecurl/pagecurl.c: code cleanup. Use enums instead of

1
app/actions/view-commands.c
View File

@ -35,6 +35,7 @@
#include "display/gimpdisplayoptions.h" #include "display/gimpdisplayoptions.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-appearance.h" #include "display/gimpdisplayshell-appearance.h"
#include "display/gimpdisplayshell-close.h"
#include "display/gimpdisplayshell-filter-dialog.h" #include "display/gimpdisplayshell-filter-dialog.h"
#include "display/gimpdisplayshell-scale.h" #include "display/gimpdisplayshell-scale.h"

2
app/display/Makefile.am
View File

@ -32,6 +32,8 @@ libappdisplay_a_sources = \
gimpdisplayshell-appearance.h \ gimpdisplayshell-appearance.h \
gimpdisplayshell-callbacks.c \ gimpdisplayshell-callbacks.c \
gimpdisplayshell-callbacks.h \ gimpdisplayshell-callbacks.h \
gimpdisplayshell-close.c \
gimpdisplayshell-close.h \
gimpdisplayshell-cursor.c \ gimpdisplayshell-cursor.c \
gimpdisplayshell-cursor.h \ gimpdisplayshell-cursor.h \
gimpdisplayshell-dnd.c \ gimpdisplayshell-dnd.c \

181
app/display/gimpdisplayshell-close.c Normal file
View File

@ -0,0 +1,181 @@
/* 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 "libgimpwidgets/gimpwidgets.h"
#include "display-types.h"
#include "config/gimpdisplayconfig.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "file/file-utils.h"
#include "widgets/gimphelp-ids.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-close.h"
#include "gimp-intl.h"
/* local function prototypes */
static void gimp_display_shell_close_dialog (GimpDisplayShell *shell,
GimpImage *gimage);
static void gimp_display_shell_close_response (GtkWidget *widget,
gboolean close,
GimpDisplayShell *shell);
/* public functions */
void
gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it)
{
GimpImage *gimage;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
gimage = shell->gdisp->gimage;
/* FIXME: gimp_busy HACK not really appropriate here because we only
* want to prevent the busy image and display to be closed. --Mitch
*/
if (gimage->gimp->busy)
return;
/* If the image has been modified, give the user a chance to save
* it before nuking it--this only applies if its the last view
* to an image canvas. (a gimage with disp_count = 1)
*/
if (! kill_it &&
gimage->disp_count == 1 &&
gimage->dirty &&
GIMP_DISPLAY_CONFIG (gimage->gimp->config)->confirm_on_close)
{
gimp_display_shell_close_dialog (shell, gimage);
}
else
{
gimp_display_delete (shell->gdisp);
}
}
/* private functions */
static void
gimp_display_shell_close_dialog (GimpDisplayShell *shell,
GimpImage *gimage)
{
GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *image;
GtkWidget *label;
gchar *name;
gchar *title;
gchar *message;
if (shell->warning_dialog)
{
gtk_window_present (GTK_WINDOW (shell->warning_dialog));
return;
}
name = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
title = g_strdup_printf (_("Close %s?"), name);
shell->warning_dialog =
dialog = gimp_dialog_new (title,
"gimp-display-shell-close",
GTK_WIDGET (shell), 0,
gimp_standard_help_func,
GIMP_HELP_FILE_CLOSE_CONFIRM,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Discard changes"), GTK_RESPONSE_OK,
NULL);
g_free (title);
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&shell->warning_dialog);
g_signal_connect (dialog, "response",
G_CALLBACK (gimp_display_shell_close_response),
shell);
hbox = gtk_hbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
gtk_widget_show (hbox);
image = gtk_image_new_from_stock (GIMP_STOCK_WARNING, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
message = g_strdup_printf (_("Changes were made to '%s'."), name);
label = gtk_label_new (message);
g_free (message);
g_free (name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_SCALE, PANGO_SCALE_LARGE,
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
-1);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Unsaved changes will be lost."));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_widget_show (dialog);
}
static void
gimp_display_shell_close_response (GtkWidget *widget,
gint response_id,
GimpDisplayShell *shell)
{
gtk_widget_destroy (GTK_WIDGET (shell->warning_dialog));
if (response_id == GTK_RESPONSE_OK)
gimp_display_delete (shell->gdisp);
}

27
app/display/gimpdisplayshell-close.h Normal file
View File

@ -0,0 +1,27 @@
/* 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 __GIMP_DISPLAY_SHELL_CLOSE_H__
#define __GIMP_DISPLAY_SHELL_CLOSE_H__
void gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it);
#endif /* __GIMP_DISPLAY_SHELL_CLOSE_H__ */

169
app/display/gimpdisplayshell.c
View File

@ -71,6 +71,7 @@
#include "gimpdisplayshell.h" #include "gimpdisplayshell.h"
#include "gimpdisplayshell-appearance.h" #include "gimpdisplayshell-appearance.h"
#include "gimpdisplayshell-callbacks.h" #include "gimpdisplayshell-callbacks.h"
#include "gimpdisplayshell-close.h"
#include "gimpdisplayshell-cursor.h" #include "gimpdisplayshell-cursor.h"
#include "gimpdisplayshell-dnd.h" #include "gimpdisplayshell-dnd.h"
#include "gimpdisplayshell-draw.h" #include "gimpdisplayshell-draw.h"
@ -107,28 +108,23 @@ enum
static void gimp_display_shell_class_init (GimpDisplayShellClass *klass); static void gimp_display_shell_class_init (GimpDisplayShellClass *klass);
static void gimp_display_shell_init (GimpDisplayShell *shell); static void gimp_display_shell_init (GimpDisplayShell *shell);
static void gimp_display_shell_finalize (GObject *object); static void gimp_display_shell_finalize (GObject *object);
static void gimp_display_shell_destroy (GtkObject *object); static void gimp_display_shell_set_property (GObject *object,
static void gimp_display_shell_set_property (GObject *object, guint property_id,
guint property_id, const GValue *value,
const GValue *value, GParamSpec *pspec);
GParamSpec *pspec); static void gimp_display_shell_get_property (GObject *object,
static void gimp_display_shell_get_property (GObject *object, guint property_id,
guint property_id, GValue *value,
GValue *value, GParamSpec *pspec);
GParamSpec *pspec);
static void gimp_display_shell_screen_changed (GtkWidget *widget,
GdkScreen *previous);
static gboolean gimp_display_shell_delete_event (GtkWidget *widget,
GdkEventAny *aevent);
static void gimp_display_shell_real_scaled (GimpDisplayShell *shell); static void gimp_display_shell_destroy (GtkObject *object);
static void gimp_display_shell_screen_changed (GtkWidget *widget,
GdkScreen *previous);
static gboolean gimp_display_shell_delete_event (GtkWidget *widget,
GdkEventAny *aevent);
static void gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell, static void gimp_display_shell_real_scaled (GimpDisplayShell *shell);
GimpImage *gimage);
static void gimp_display_shell_close_warning_response (GtkWidget *widget,
gboolean close,
GimpDisplayShell *shell);
static guint display_shell_signals[LAST_SIGNAL] = { 0 }; static guint display_shell_signals[LAST_SIGNAL] = { 0 };
@ -983,35 +979,6 @@ gimp_display_shell_new (GimpDisplay *gdisp,
return GTK_WIDGET (shell); return GTK_WIDGET (shell);
} }
void
gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it)
{
GimpImage *gimage = shell->gdisp->gimage;
/* FIXME: gimp_busy HACK not really appropriate here because we only
* want to prevent the busy image and display to be closed. --Mitch
*/
if (gimage->gimp->busy)
return;
/* If the image has been modified, give the user a chance to save
* it before nuking it--this only applies if its the last view
* to an image canvas. (a gimage with disp_count = 1)
*/
if (! kill_it &&
gimage->disp_count == 1 &&
gimage->dirty &&
GIMP_DISPLAY_CONFIG (gimage->gimp->config)->confirm_on_close)
{
gimp_display_shell_close_warning_dialog (shell, gimage);
}
else
{
gimp_display_delete (shell->gdisp);
}
}
void void
gimp_display_shell_reconnect (GimpDisplayShell *shell) gimp_display_shell_reconnect (GimpDisplayShell *shell)
{ {
@ -1338,13 +1305,10 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
width = MAX (shell->icon_size, 1); width = MAX (shell->icon_size, 1);
} }
pixbuf = gimp_viewable_get_new_pixbuf (GIMP_VIEWABLE (shell->gdisp->gimage), pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (shell->gdisp->gimage),
width, height); width, height);
gtk_window_set_icon (GTK_WINDOW (shell), pixbuf); gtk_window_set_icon (GTK_WINDOW (shell), pixbuf);
if (pixbuf)
g_object_unref (pixbuf);
} }
void void
@ -1443,100 +1407,3 @@ gimp_display_shell_selection_visibility (GimpDisplayShell *shell,
} }
} }
} }
/* private functions */
static void
gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
GimpImage *gimage)
{
GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *image;
GtkWidget *label;
gchar *name;
gchar *title;
gchar *message;
if (shell->warning_dialog)
{
gtk_window_present (GTK_WINDOW (shell->warning_dialog));
return;
}
name = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
title = g_strdup_printf (_("Close %s?"), name);
shell->warning_dialog =
dialog = gimp_dialog_new (title,
"gimp-display-shell-close",
GTK_WIDGET (shell), 0,
gimp_standard_help_func,
GIMP_HELP_FILE_CLOSE_CONFIRM,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Discard changes"), GTK_RESPONSE_OK,
NULL);
g_free (title);
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&shell->warning_dialog);
g_signal_connect (dialog, "response",
G_CALLBACK (gimp_display_shell_close_warning_response),
shell);
hbox = gtk_hbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
gtk_widget_show (hbox);
image = gtk_image_new_from_stock (GIMP_STOCK_WARNING, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
message = g_strdup_printf (_("Changes were made to '%s'."), name);
label = gtk_label_new (message);
g_free (message);
g_free (name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gimp_label_set_attributes (GTK_LABEL (label),
PANGO_ATTR_SCALE, PANGO_SCALE_LARGE,
PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
-1);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Unsaved changes will be lost."));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_widget_show (dialog);
}
static void
gimp_display_shell_close_warning_response (GtkWidget *widget,
gint response_id,
GimpDisplayShell *shell)
{
gtk_widget_destroy (GTK_WIDGET (shell->warning_dialog));
if (response_id == GTK_RESPONSE_OK)
gimp_display_delete (shell->gdisp);
}

3
app/display/gimpdisplayshell.h
View File

@ -185,9 +185,6 @@ GtkWidget * gimp_display_shell_new (GimpDisplay *gdisp,
GimpMenuFactory *menu_factory, GimpMenuFactory *menu_factory,
GimpUIManager *popup_manager); GimpUIManager *popup_manager);
void gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it);
void gimp_display_shell_reconnect (GimpDisplayShell *shell); void gimp_display_shell_reconnect (GimpDisplayShell *shell);
void gimp_display_shell_scaled (GimpDisplayShell *shell); void gimp_display_shell_scaled (GimpDisplayShell *shell);