dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp*: get rid of icons in dialog buttons (use labels not stock IDs)

This commit is contained in:
Michael Natterer 2017-02-12 16:10:50 +01:00
parent 7da7bab09c
commit 40981f43cf
9 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libgimp/gimpexport.c
View File

@ -436,8 +436,8 @@ confirm_save_dialog (const gchar *message,
gimp_standard_help_func,
"gimp-export-confirm-dialog",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Confirm"), GTK_RESPONSE_OK,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("C_onfirm"), GTK_RESPONSE_OK,
NULL);
@ -517,9 +517,9 @@ export_dialog (GSList *actions,
NULL, 0,
gimp_standard_help_func, "gimp-export-dialog",
_("_Ignore"), GTK_RESPONSE_NO,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Export"), GTK_RESPONSE_OK,
_("_Ignore"), GTK_RESPONSE_NO,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Export"), GTK_RESPONSE_OK,
NULL);
@ -1003,21 +1003,17 @@ gimp_export_dialog_new (const gchar *format_name,
const gchar *role,
const gchar *help_id)
{
GtkWidget *dialog = NULL;
GtkWidget *button = NULL;
GtkWidget *dialog;
gchar *title = g_strconcat (_("Export Image as "), format_name, NULL);
dialog = gimp_dialog_new (title, role,
NULL, 0,
gimp_standard_help_func, help_id,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
button = gimp_dialog_add_button (GIMP_DIALOG (dialog),
_("_Export"), GTK_RESPONSE_OK);
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_icon_name ("document-save",
GTK_ICON_SIZE_BUTTON));
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Export"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,

4
libgimp/gimpimagemetadata.c
View File

@ -804,8 +804,8 @@ gimp_image_metadata_rotate_dialog (gint32 image_ID,
dialog = gimp_dialog_new (title, "gimp-metadata-rotate-dialog",
NULL, 0, NULL, NULL,
_("_Keep Original"), GTK_RESPONSE_CANCEL,
GIMP_STOCK_TOOL_ROTATE, GTK_RESPONSE_OK,
_("_Keep Original"), GTK_RESPONSE_CANCEL,
_("_Rotate"), GTK_RESPONSE_OK,
NULL);

6
libgimpwidgets/gimpcolorbutton.c
View File

@ -536,9 +536,9 @@ gimp_color_button_clicked (GtkButton *button)
gtk_widget_get_toplevel (GTK_WIDGET (button)), 0,
gimp_color_button_help_func, NULL,
GIMP_STOCK_RESET, RESPONSE_RESET,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
_("_Reset"), RESPONSE_RESET,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_OK"), GTK_RESPONSE_OK,
NULL);

8
libgimpwidgets/gimpcolorprofilechooserdialog.c
View File

@ -149,8 +149,8 @@ gimp_color_profile_chooser_dialog_new (const gchar *title,
GTK_FILE_CHOOSER_ACTION_SAVE)
{
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Save"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
@ -159,8 +159,8 @@ gimp_color_profile_chooser_dialog_new (const gchar *title,
else
{
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
}

4
libgimpwidgets/gimpdialog.c
View File

@ -28,6 +28,8 @@
#include "gimpdialog.h"
#include "gimphelpui.h"
#include "libgimp/libgimp-intl.h"
/**
* SECTION: gimpdialog
@ -170,7 +172,7 @@ gimp_dialog_constructed (GObject *object)
GtkDialog *dialog = GTK_DIALOG (object);
GtkWidget *action_area = gtk_dialog_get_action_area (dialog);
private->help_button = gtk_button_new_from_stock (GTK_STOCK_HELP);
private->help_button = gtk_button_new_with_mnemonic (_("_Help"));
gtk_box_pack_end (GTK_BOX (action_area), private->help_button,
FALSE, TRUE, 0);

4
libgimpwidgets/gimpfileentry.c
View File

@ -439,8 +439,8 @@ gimp_file_entry_browse_clicked (GtkWidget *widget,
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_OK"), GTK_RESPONSE_OK,
NULL);

8
libgimpwidgets/gimpquerybox.c
View File

@ -271,7 +271,7 @@ gimp_query_string_box (const gchar *title,
G_CALLBACK (string_query_box_response),
"dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
_("_OK"), _("_Cancel"),
object, signal,
G_CALLBACK (callback), data);
@ -331,7 +331,7 @@ gimp_query_int_box (const gchar *title,
G_CALLBACK (int_query_box_response),
"dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
_("_OK"), _("_Cancel"),
object, signal,
G_CALLBACK (callback), data);
@ -395,7 +395,7 @@ gimp_query_double_box (const gchar *title,
G_CALLBACK (double_query_box_response),
"dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
_("_OK"), _("_Cancel"),
object, signal,
G_CALLBACK (callback), data);
@ -469,7 +469,7 @@ gimp_query_size_box (const gchar *title,
G_CALLBACK (size_query_box_response),
"dialog-question",
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
_("_OK"), _("_Cancel"),
object, signal,
G_CALLBACK (callback), data);

4
libgimpwidgets/gimpunitmenu.c
View File

@ -493,8 +493,8 @@ gimp_unit_menu_create_selection (GimpUnitMenu *menu)
gimp_standard_help_func,
"gimp-unit-dialog",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_OK"), GTK_RESPONSE_OK,
NULL);

1
po-libgimp/POTFILES.in
View File

@ -49,6 +49,7 @@ libgimpwidgets/gimpcolorprofileview.c
libgimpwidgets/gimpcolorscales.c
libgimpwidgets/gimpcolorselect.c
libgimpwidgets/gimpcolorselection.c
libgimpwidgets/gimpdialog.c
libgimpwidgets/gimpfileentry.c
libgimpwidgets/gimphelpui.c
libgimpwidgets/gimpicons.c