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

Bug 675399 - Mention that the image was at least exported in the close...

Browse Source 
If the image was exported, mention it in the close warning dialog.
This commit is contained in:
Michael Natterer
2012-05-10 01:10:27 +02:00
parent 8a53c7d29b
commit 57d4680ab3
1 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/display/gimpdisplayshell-close.c
View File

@ -54,6 +54,9 @@ static void gimp_display_shell_close_dialog (GimpDisplayShell *shell,
GimpImage *image); GimpImage *image);
static void gimp_display_shell_close_name_changed (GimpImage *image, static void gimp_display_shell_close_name_changed (GimpImage *image,
GimpMessageBox *box); GimpMessageBox *box);
static void gimp_display_shell_close_exported (GimpImage *image,
const gchar *uri,
GimpMessageBox *box);
static gboolean gimp_display_shell_close_time_changed (GimpMessageBox *box); static gboolean gimp_display_shell_close_time_changed (GimpMessageBox *box);
static void gimp_display_shell_close_response (GtkWidget *widget, static void gimp_display_shell_close_response (GtkWidget *widget,
gboolean close, gboolean close,
@ -188,6 +191,9 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
g_signal_connect_object (image, "name-changed", g_signal_connect_object (image, "name-changed",
G_CALLBACK (gimp_display_shell_close_name_changed), G_CALLBACK (gimp_display_shell_close_name_changed),
box, 0); box, 0);
g_signal_connect_object (image, "exported",
G_CALLBACK (gimp_display_shell_close_exported),
box, 0);
gimp_display_shell_close_name_changed (image, box); gimp_display_shell_close_name_changed (image, box);
@ -232,12 +238,21 @@ gimp_display_shell_close_name_changed (GimpImage *image,
gimp_image_get_display_name (image)); gimp_image_get_display_name (image));
} }
static void
gimp_display_shell_close_exported (GimpImage *image,
const gchar *uri,
GimpMessageBox *box)
{
gimp_display_shell_close_time_changed (box);
}
static gboolean static gboolean
gimp_display_shell_close_time_changed (GimpMessageBox *box) gimp_display_shell_close_time_changed (GimpMessageBox *box)
{ {
GimpImage *image = g_object_get_data (G_OBJECT (box), "gimp-image"); GimpImage *image = g_object_get_data (G_OBJECT (box), "gimp-image");
gint dirty_time = gimp_image_get_dirty_time (image); gint dirty_time = gimp_image_get_dirty_time (image);
gchar *time_text = NULL;
gchar *export_text = NULL;
if (dirty_time) if (dirty_time)
{ {
@ -249,18 +264,20 @@ gimp_display_shell_close_time_changed (GimpMessageBox *box)
if (hours > 0) if (hours > 0)
{ {
if (hours > 1 || minutes == 0) if (hours > 1 || minutes == 0)
gimp_message_box_set_text (box, {
ngettext ("If you don't save the image, " time_text =
g_strdup_printf (ngettext ("If you don't save the image, "
"changes from the last hour " "changes from the last hour "
"will be lost.", "will be lost.",
"If you don't save the image, " "If you don't save the image, "
"changes from the last %d " "changes from the last %d "
"hours will be lost.", "hours will be lost.",
hours), hours); hours), hours);
}
else else
gimp_message_box_set_text (box, {
ngettext ("If you don't save the image, " time_text =
g_strdup_printf (ngettext ("If you don't save the image, "
"changes from the last hour " "changes from the last hour "
"and %d minute will be lost.", "and %d minute will be lost.",
"If you don't save the image, " "If you don't save the image, "
@ -268,10 +285,11 @@ gimp_display_shell_close_time_changed (GimpMessageBox *box)
"and %d minutes will be lost.", "and %d minutes will be lost.",
minutes), minutes); minutes), minutes);
} }
}
else else
{ {
gimp_message_box_set_text (box, time_text =
ngettext ("If you don't save the image, " g_strdup_printf (ngettext ("If you don't save the image, "
"changes from the last minute " "changes from the last minute "
"will be lost.", "will be lost.",
"If you don't save the image, " "If you don't save the image, "
@ -280,10 +298,21 @@ gimp_display_shell_close_time_changed (GimpMessageBox *box)
minutes), minutes); minutes), minutes);
} }
} }
if (! gimp_image_is_export_dirty (image))
export_text =
g_strdup_printf (_("The image has been exported to '%s'."),
gimp_image_get_exported_uri (image));
if (time_text && export_text)
gimp_message_box_set_text (box, "%s\n\n%s", time_text, export_text);
else if (time_text || export_text)
gimp_message_box_set_text (box, "%s", time_text ? time_text : export_text);
else else
{ gimp_message_box_set_text (box, "%s", time_text);
gimp_message_box_set_text (box, NULL);
} g_free (time_text);
g_free (export_text);
return TRUE; return TRUE;
} }