From c11ef1413f78d289abf5262b7c04bf7dc1e4931b Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 16 Mar 2009 13:48:46 +0000 Subject: [PATCH] adapt button labels to the latest GNOME HIG. 2009-03-16 Sven Neumann * app/display/gimpdisplayshell-close.c (gimp_display_shell_close_dialog): adapt button labels to the latest GNOME HIG. svn path=/trunk/; revision=28161 --- ChangeLog | 6 ++++++ app/display/gimpdisplayshell-close.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8eae8899e..5c2cd71075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-16 Sven Neumann + + * app/display/gimpdisplayshell-close.c + (gimp_display_shell_close_dialog): adapt button labels to the + latest GNOME HIG. + 2009-03-16 Tor Lillqvist * app/version.c (gimp_show_library_version): The build-time and diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c index 5276385bf0..f87d159707 100644 --- a/app/display/gimpdisplayshell-close.c +++ b/app/display/gimpdisplayshell-close.c @@ -134,6 +134,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, GClosure *closure; GSource *source; gchar *title; + const gchar *uri; if (shell->close_dialog) { @@ -141,6 +142,8 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, return; } + uri = gimp_object_get_name (GIMP_OBJECT (image)); + title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image)); shell->close_dialog = @@ -151,15 +154,12 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, NULL); g_free (title); - button = gtk_dialog_add_button (GTK_DIALOG (dialog), - _("Do_n't Save"), GTK_RESPONSE_CLOSE); - gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_stock (GTK_STOCK_DELETE, - GTK_ICON_SIZE_BUTTON)); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, RESPONSE_SAVE, + _("Close _without Saving"), GTK_RESPONSE_CLOSE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + (uri ? + GTK_STOCK_SAVE : + GTK_STOCK_SAVE_AS), RESPONSE_SAVE, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);