[gimp] app: get rid of icons in dialog buttons (use labels not stock IDs)
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: get rid of icons in dialog buttons (use labels not stock IDs)
- Date: Sun, 12 Feb 2017 15:25:02 +0000 (UTC)
commit 7da7bab09c8f51e4e0d19367cd99542d67d1db4b
Author: Michael Natterer <mitch gimp org>
Date: Sun Feb 12 16:06:34 2017 +0100
app: get rid of icons in dialog buttons (use labels not stock IDs)
Nobody has them anymore, and they are deprecated in GTK+ 3.x. This
also fixes all conflicting mnemonics except those I missed, but we can
fix them now.
app/actions/documents-commands.c | 4 +-
app/actions/edit-commands.c | 4 +-
app/actions/error-console-commands.c | 4 +-
app/actions/file-commands.c | 4 +-
app/actions/gradient-editor-commands.c | 8 +++---
app/actions/gradients-commands.c | 4 +-
app/actions/plug-in-commands.c | 4 +-
app/actions/templates-commands.c | 4 +-
app/actions/text-editor-commands.c | 4 +-
app/actions/text-tool-commands.c | 4 +-
app/actions/tool-options-commands.c | 5 ++-
app/actions/window-commands.c | 6 +++-
app/dialogs/color-profile-dialog.c | 20 ++++++++--------
app/dialogs/convert-indexed-dialog.c | 9 +-----
app/dialogs/convert-precision-dialog.c | 10 +------
app/dialogs/data-delete-dialog.c | 4 +-
app/dialogs/fade-dialog.c | 4 +-
app/dialogs/file-open-location-dialog.c | 12 +++++-----
app/dialogs/file-save-dialog.c | 6 ++--
app/dialogs/fill-dialog.c | 6 ++--
app/dialogs/grid-dialog.c | 6 ++--
app/dialogs/image-merge-layers-dialog.c | 4 +-
app/dialogs/image-new-dialog.c | 10 ++++----
app/dialogs/image-properties-dialog.c | 2 +-
app/dialogs/image-scale-dialog.c | 4 +-
app/dialogs/input-devices-dialog.c | 4 +-
app/dialogs/item-options-dialog.c | 4 +-
app/dialogs/keyboard-shortcuts-dialog.c | 2 +-
app/dialogs/layer-add-mask-dialog.c | 4 +-
app/dialogs/module-dialog.c | 4 +-
app/dialogs/offset-dialog.c | 4 +-
app/dialogs/palette-import-dialog.c | 10 +------
app/dialogs/preferences-dialog.c | 14 +++++-----
app/dialogs/print-size-dialog.c | 6 ++--
app/dialogs/quit-dialog.c | 4 +-
app/dialogs/resize-dialog.c | 6 ++--
app/dialogs/resolution-calibrate-dialog.c | 4 +-
app/dialogs/scale-dialog.c | 6 ++--
app/dialogs/stroke-dialog.c | 6 ++--
app/dialogs/template-options-dialog.c | 4 +-
app/dialogs/user-install-dialog.c | 2 +-
app/dialogs/vectors-export-dialog.c | 12 ++++-----
app/dialogs/vectors-import-dialog.c | 13 ++++------
app/display/gimpdisplayshell-close.c | 16 +++++-------
app/display/gimpdisplayshell-filter-dialog.c | 4 +-
app/display/gimpdisplayshell-rotate-dialog.c | 6 ++--
app/display/gimpdisplayshell-scale-dialog.c | 4 +-
app/gui/gui.c | 4 ++-
app/tools/gimpcolorpickertool.c | 2 +-
app/tools/gimpfiltertool.c | 6 ++--
app/tools/gimpfliptool.c | 10 +++++---
app/tools/gimpforegroundselecttool.c | 6 +++-
app/tools/gimpmeasuretool.c | 2 +-
app/tools/gimprotatetool.c | 18 ++++++++------
app/tools/gimpscaletool.c | 14 ++++++-----
app/tools/gimpsheartool.c | 14 ++++++-----
app/tools/gimptexttool.c | 4 +-
app/tools/gimptransformtool.c | 12 +++++----
app/tools/gimptransformtool.h | 2 +
app/widgets/gimpactionview.c | 5 ++-
app/widgets/gimpcolordialog.c | 9 +++++--
app/widgets/gimpcontrollereditor.c | 4 +-
app/widgets/gimpcontrollerlist.c | 8 +++---
app/widgets/gimpdeviceeditor.c | 4 +-
app/widgets/gimpdnd-xds.c | 4 +-
app/widgets/gimperrordialog.c | 4 ++-
app/widgets/gimpexportdialog.c | 2 +-
app/widgets/gimpfiledialog.c | 32 ++++++++++++++-----------
app/widgets/gimpfiledialog.h | 2 +-
app/widgets/gimphelp.c | 16 +++++--------
app/widgets/gimpiconpicker.c | 8 +++++-
app/widgets/gimpopendialog.c | 2 +-
app/widgets/gimppdbdialog.c | 2 +-
app/widgets/gimpprogressdialog.c | 2 +-
app/widgets/gimpsavedialog.c | 2 +-
app/widgets/gimpsettingsbox.c | 13 +++++-----
app/widgets/gimptexteditor.c | 2 +-
po/POTFILES.in | 1 +
78 files changed, 256 insertions(+), 251 deletions(-)
---
diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c
index 174a7d8..f237329 100644
--- a/app/actions/documents-commands.c
+++ b/app/actions/documents-commands.c
@@ -227,8 +227,8 @@ documents_clear_cmd_callback (GtkAction *action,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("Cl_ear"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 3ab77be..36c0946 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -158,8 +158,8 @@ edit_undo_clear_cmd_callback (GtkAction *action,
gimp_standard_help_func,
GIMP_HELP_EDIT_UNDO_CLEAR,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("Cl_ear"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/error-console-commands.c b/app/actions/error-console-commands.c
index a337a59..b9da590 100644
--- a/app/actions/error-console-commands.c
+++ b/app/actions/error-console-commands.c
@@ -93,8 +93,8 @@ error_console_save_cmd_callback (GtkAction *action,
gtk_file_chooser_dialog_new (_("Save Error Log to File"), NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 71ca371..8252ff9 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -438,8 +438,8 @@ file_revert_cmd_callback (GtkAction *action,
0,
gimp_standard_help_func, GIMP_HELP_FILE_REVERT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Revert"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
index fdfd680..1f25eba 100644
--- a/app/actions/gradient-editor-commands.c
+++ b/app/actions/gradient-editor-commands.c
@@ -479,8 +479,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
gimp_standard_help_func,
GIMP_HELP_GRADIENT_EDITOR_REPLICATE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Replicate"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Replicate"), GTK_RESPONSE_OK,
NULL);
@@ -581,8 +581,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
gimp_standard_help_func,
GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Split"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Split"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/gradients-commands.c b/app/actions/gradients-commands.c
index a213897..c219257 100644
--- a/app/actions/gradients-commands.c
+++ b/app/actions/gradients-commands.c
@@ -75,8 +75,8 @@ gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
dialog = gtk_file_chooser_dialog_new (title, NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index 7ccfecb..dcc7bd4 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -177,8 +177,8 @@ plug_in_reset_all_cmd_callback (GtkAction *action,
NULL, 0,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_RESET, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Reset"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index ab165ce..d88902d 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -241,8 +241,8 @@ templates_delete_cmd_callback (GtkAction *action,
GTK_WIDGET (editor), 0,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/text-editor-commands.c b/app/actions/text-editor-commands.c
index 069e0f5..ffe1d6d 100644
--- a/app/actions/text-editor-commands.c
+++ b/app/actions/text-editor-commands.c
@@ -61,8 +61,8 @@ text_editor_load_cmd_callback (GtkAction *action,
GTK_WINDOW (editor),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/text-tool-commands.c b/app/actions/text-tool-commands.c
index 666b553..5db2771 100644
--- a/app/actions/text-tool-commands.c
+++ b/app/actions/text-tool-commands.c
@@ -115,8 +115,8 @@ text_tool_load_cmd_callback (GtkAction *action,
parent ? GTK_WINDOW (parent) : NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
index 6d40337..ca0f6f2 100644
--- a/app/actions/tool-options-commands.c
+++ b/app/actions/tool-options-commands.c
@@ -192,11 +192,12 @@ tool_options_reset_all_cmd_callback (GtkAction *action,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_RESET, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Reset"), GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
diff --git a/app/actions/window-commands.c b/app/actions/window-commands.c
index a20ab39..b81b470 100644
--- a/app/actions/window-commands.c
+++ b/app/actions/window-commands.c
@@ -32,6 +32,8 @@
#include "actions.h"
#include "window-commands.h"
+#include "gimp-intl.h"
+
/* public functions */
@@ -70,8 +72,8 @@ window_open_display_cmd_callback (GtkAction *action,
widget, GTK_DIALOG_MODAL,
NULL, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/color-profile-dialog.c b/app/dialogs/color-profile-dialog.c
index d8c7bf6..9ed3a7b 100644
--- a/app/dialogs/color-profile-dialog.c
+++ b/app/dialogs/color-profile-dialog.c
@@ -133,8 +133,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
gimp_standard_help_func,
GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Assign"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Assign"), GTK_RESPONSE_OK,
NULL);
dest_label = _("Assign");
@@ -151,8 +151,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
gimp_standard_help_func,
GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_onvert"), GTK_RESPONSE_OK,
NULL);
dest_label = _("Convert to");
@@ -169,8 +169,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
gimp_standard_help_func,
GIMP_HELP_IMAGE_CONVERT_RGB,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_onvert"), GTK_RESPONSE_OK,
NULL);
dest_label = _("Convert to");
@@ -187,8 +187,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
gimp_standard_help_func,
GIMP_HELP_IMAGE_CONVERT_GRAYSCALE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CONVERT, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_onvert"), GTK_RESPONSE_OK,
NULL);
dest_label = _("Convert to");
@@ -205,8 +205,8 @@ color_profile_dialog_new (ColorProfileDialogType dialog_type,
gimp_standard_help_func,
GIMP_HELP_VIEW_COLOR_MANAGEMENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Select"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Select"), GTK_RESPONSE_OK,
NULL);
dest_label = _("New Color Profile");
diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c
index 66efe12..36edd59 100644
--- a/app/dialogs/convert-indexed-dialog.c
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -135,16 +135,11 @@ convert_indexed_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_IMAGE_CONVERT_INDEXED,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_onvert"), GTK_RESPONSE_OK,
NULL);
- button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("C_onvert"), GTK_RESPONSE_OK);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_INDEXED,
- GTK_ICON_SIZE_BUTTON));
-
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
diff --git a/app/dialogs/convert-precision-dialog.c b/app/dialogs/convert-precision-dialog.c
index 1010141..0b50932 100644
--- a/app/dialogs/convert-precision-dialog.c
+++ b/app/dialogs/convert-precision-dialog.c
@@ -78,7 +78,6 @@ convert_precision_dialog_new (GimpImage *image,
{
ConvertDialog *private;
GtkWidget *dialog;
- GtkWidget *button;
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkWidget *frame;
@@ -163,18 +162,13 @@ convert_precision_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_IMAGE_CONVERT_PRECISION,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_onvert"), GTK_RESPONSE_OK,
NULL);
g_free (blurb);
- button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("C_onvert"), GTK_RESPONSE_OK);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name (GIMP_STOCK_CONVERT_PRECISION,
- GTK_ICON_SIZE_BUTTON));
-
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
diff --git a/app/dialogs/data-delete-dialog.c b/app/dialogs/data-delete-dialog.c
index faef53e..a5a7610 100644
--- a/app/dialogs/data-delete-dialog.c
+++ b/app/dialogs/data-delete-dialog.c
@@ -83,8 +83,8 @@ data_delete_dialog_new (GimpDataFactory *factory,
gtk_widget_get_toplevel (parent), 0,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c
index 2adb8af..bf0746e 100644
--- a/app/dialogs/fade-dialog.c
+++ b/app/dialogs/fade-dialog.c
@@ -117,8 +117,8 @@ fade_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_EDIT_FADE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Fade"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Fade"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
index b19a295..22abf52 100644
--- a/app/dialogs/file-open-location-dialog.c
+++ b/app/dialogs/file-open-location-dialog.c
@@ -77,20 +77,20 @@ file_open_location_dialog_new (Gimp *gimp)
gimp_standard_help_func,
GIMP_HELP_FILE_OPEN_LOCATION,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
- g_signal_connect (dialog, "response",
- G_CALLBACK (file_open_location_response),
- gimp);
-
gtk_dialog_set_alternative_button_order (GTK_DIALOG(dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (file_open_location_response),
+ gimp);
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
index b23c530..9d0561d 100644
--- a/app/dialogs/file-save-dialog.c
+++ b/app/dialogs/file-save-dialog.c
@@ -629,7 +629,7 @@ file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
@@ -705,8 +705,8 @@ file_save_dialog_use_extension (GtkWidget *save_dialog,
save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/fill-dialog.c b/app/dialogs/fill-dialog.c
index 24ec9ad..6c29f5a 100644
--- a/app/dialogs/fill-dialog.c
+++ b/app/dialogs/fill-dialog.c
@@ -111,9 +111,9 @@ fill_dialog_new (GimpItem *item,
gimp_standard_help_func,
help_id,
- GIMP_STOCK_RESET, RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Fill"), GTK_RESPONSE_OK,
+ _("_Reset"), RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Fill"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c
index 8bbb5d5..3c74297 100644
--- a/app/dialogs/grid-dialog.c
+++ b/app/dialogs/grid-dialog.c
@@ -98,9 +98,9 @@ grid_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_IMAGE_GRID,
- GIMP_STOCK_RESET, GRID_RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Reset"), GRID_RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c
index 639cc1f..2903477 100644
--- a/app/dialogs/image-merge-layers-dialog.c
+++ b/app/dialogs/image-merge-layers-dialog.c
@@ -97,8 +97,8 @@ image_merge_layers_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_IMAGE_MERGE_LAYERS,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Merge"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Merge"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index 3bd4482..9400d4e 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -102,9 +102,9 @@ image_new_dialog_new (GimpContext *context)
NULL, 0,
gimp_standard_help_func, GIMP_HELP_FILE_NEW,
- 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);
@@ -322,8 +322,8 @@ image_new_confirm_dialog (ImageNewDialog *private)
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c
index 01c24e2..a8542df 100644
--- a/app/dialogs/image-properties-dialog.c
+++ b/app/dialogs/image-properties-dialog.c
@@ -65,7 +65,7 @@ image_properties_dialog_new (GimpImage *image,
gimp_standard_help_func,
GIMP_HELP_IMAGE_PROPERTIES,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ _("_Close"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/image-scale-dialog.c b/app/dialogs/image-scale-dialog.c
index 44c8dc4..1de1034 100644
--- a/app/dialogs/image-scale-dialog.c
+++ b/app/dialogs/image-scale-dialog.c
@@ -207,8 +207,8 @@ image_scale_confirm_dialog (ImageScaleDialog *private)
gimp_standard_help_func,
GIMP_HELP_IMAGE_SCALE_WARNING,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_SCALE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Scale"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/input-devices-dialog.c b/app/dialogs/input-devices-dialog.c
index b69a705..15e9787 100644
--- a/app/dialogs/input-devices-dialog.c
+++ b/app/dialogs/input-devices-dialog.c
@@ -59,8 +59,8 @@ input_devices_dialog_new (Gimp *gimp)
gimp_standard_help_func,
GIMP_HELP_INPUT_DEVICES,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ _("_Close"), GTK_RESPONSE_CLOSE,
+ _("_Save"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/item-options-dialog.c b/app/dialogs/item-options-dialog.c
index 15705bf..a1e05cb 100644
--- a/app/dialogs/item-options-dialog.c
+++ b/app/dialogs/item-options-dialog.c
@@ -142,8 +142,8 @@ item_options_dialog_new (GimpImage *image,
parent,
gimp_standard_help_func, help_id,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c
index 5f3171d..37aad61 100644
--- a/app/dialogs/keyboard-shortcuts-dialog.c
+++ b/app/dialogs/keyboard-shortcuts-dialog.c
@@ -52,7 +52,7 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
gimp_standard_help_func,
GIMP_HELP_KEYBOARD_SHORTCUTS,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ _("_Close"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c
index 8dd09ff..380ade9 100644
--- a/app/dialogs/layer-add-mask-dialog.c
+++ b/app/dialogs/layer-add-mask-dialog.c
@@ -107,8 +107,8 @@ layer_add_mask_dialog_new (GimpLayer *layer,
gimp_standard_help_func,
GIMP_HELP_LAYER_MASK_ADD,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_ADD, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Add"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c
index a52aded..9705e4a 100644
--- a/app/dialogs/module-dialog.c
+++ b/app/dialogs/module-dialog.c
@@ -130,8 +130,8 @@ module_dialog_new (Gimp *gimp)
"gimp-modules", NULL, 0,
gimp_standard_help_func, GIMP_HELP_MODULE_DIALOG,
- GTK_STOCK_REFRESH, RESPONSE_REFRESH,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Refresh"), RESPONSE_REFRESH,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 450b94e..32f2760 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -133,9 +133,9 @@ offset_dialog_new (GimpDrawable *drawable,
gimp_standard_help_func,
GIMP_HELP_LAYER_OFFSET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
/* offset, used as a verb */
- _("_Offset"), GTK_RESPONSE_OK,
+ _("_Offset"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index ba9baf9..10642dd 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -135,7 +135,6 @@ palette_import_dialog_new (GimpContext *context)
ImportDialog *private;
GimpGradient *gradient;
GtkWidget *dialog;
- GtkWidget *button;
GtkWidget *main_hbox;
GtkWidget *frame;
GtkWidget *vbox;
@@ -160,16 +159,11 @@ palette_import_dialog_new (GimpContext *context)
gimp_standard_help_func,
GIMP_HELP_PALETTE_IMPORT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Import"), GTK_RESPONSE_OK,
NULL);
- button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("_Import"), GTK_RESPONSE_OK);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("gtk-convert",
- GTK_ICON_SIZE_BUTTON));
-
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 28d1792..00feb97 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -273,8 +273,8 @@ prefs_response (GtkWidget *widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_RESET, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Reset"), GTK_RESPONSE_OK,
NULL);
@@ -603,8 +603,8 @@ prefs_menus_remove_callback (GtkWidget *widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("Cl_ear"), GTK_RESPONSE_OK,
NULL);
@@ -995,9 +995,9 @@ prefs_dialog_new (Gimp *gimp,
prefs_help_func,
GIMP_HELP_PREFS_DIALOG,
- 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);
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index 7597b7a..ea4c239 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -120,9 +120,9 @@ print_size_dialog_new (GimpImage *image,
parent,
help_func, help_id,
- 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);
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 0b4da80..252f20a 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -167,7 +167,7 @@ quit_close_all_dialog_new (Gimp *gimp,
do_quit ?
GIMP_HELP_FILE_QUIT : GIMP_HELP_FILE_CLOSE_ALL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
@@ -359,7 +359,7 @@ quit_close_all_dialog_container_changed (GimpContainer *images,
accel_string);
g_object_set (private->ok_button,
- "label", private->do_quit ? GTK_STOCK_QUIT : GTK_STOCK_CLOSE,
+ "label", private->do_quit ? _("_Quit") : _("Cl_ose"),
"use-stock", TRUE,
"image", NULL,
NULL);
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index 0d46668..038f518 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -182,9 +182,9 @@ resize_dialog_new (GimpViewable *viewable,
parent,
help_func, help_id,
- GIMP_STOCK_RESET, RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_RESIZE, GTK_RESPONSE_OK,
+ _("Re_set"), RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Resize"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c
index a3ba71f..561da40 100644
--- a/app/dialogs/resolution-calibrate-dialog.c
+++ b/app/dialogs/resolution-calibrate-dialog.c
@@ -73,8 +73,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
GTK_DIALOG_DESTROY_WITH_PARENT,
NULL, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c
index 9cbd897..c11c268 100644
--- a/app/dialogs/scale-dialog.c
+++ b/app/dialogs/scale-dialog.c
@@ -133,9 +133,9 @@ scale_dialog_new (GimpViewable *viewable,
parent,
help_func, help_id,
- GIMP_STOCK_RESET, RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_SCALE, GTK_RESPONSE_OK,
+ _("_Reset"), RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Scale"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c
index 510f0d7..e48c046 100644
--- a/app/dialogs/stroke-dialog.c
+++ b/app/dialogs/stroke-dialog.c
@@ -124,9 +124,9 @@ stroke_dialog_new (GimpItem *item,
gimp_standard_help_func,
help_id,
- GIMP_STOCK_RESET, RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- icon_name, GTK_RESPONSE_OK,
+ _("_Reset"), RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Stroke"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c
index ecfcf0d..b158997 100644
--- a/app/dialogs/template-options-dialog.c
+++ b/app/dialogs/template-options-dialog.c
@@ -115,8 +115,8 @@ template_options_dialog_new (GimpTemplate *template,
parent,
gimp_standard_help_func, help_id,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index 43caef8..aa0d68c 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -86,7 +86,7 @@ user_install_dialog_new (GimpUserInstall *install)
GIMP_STOCK_WILBER_EEK,
NULL, 0, NULL, NULL,
- GTK_STOCK_QUIT, GTK_RESPONSE_OK,
+ _("_Quit"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/dialogs/vectors-export-dialog.c b/app/dialogs/vectors-export-dialog.c
index db9608d..1a69dd3 100644
--- a/app/dialogs/vectors-export-dialog.c
+++ b/app/dialogs/vectors-export-dialog.c
@@ -80,23 +80,21 @@ vectors_export_dialog_new (GimpImage *image,
dialog = gtk_file_chooser_dialog_new (_("Export Path to SVG"), NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
- gtk_window_set_screen (GTK_WINDOW (dialog),
- gtk_widget_get_screen (parent));
-
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-export");
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+ gtk_window_set_screen (GTK_WINDOW (dialog),
+ gtk_widget_get_screen (parent));
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
TRUE);
diff --git a/app/dialogs/vectors-import-dialog.c b/app/dialogs/vectors-import-dialog.c
index ce0fd8b..e1f1cc5 100644
--- a/app/dialogs/vectors-import-dialog.c
+++ b/app/dialogs/vectors-import-dialog.c
@@ -85,24 +85,21 @@ vectors_import_dialog_new (GimpImage *image,
dialog = gtk_file_chooser_dialog_new (_("Import Paths from SVG"), NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog),
- GTK_RESPONSE_OK);
-
- gtk_window_set_screen (GTK_WINDOW (dialog),
- gtk_widget_get_screen (parent));
-
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-vectors-import");
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+ gtk_window_set_screen (GTK_WINDOW (dialog),
+ gtk_widget_get_screen (parent));
if (import_folder)
gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
index c75ec1e..b422c5b 100644
--- a/app/display/gimpdisplayshell-close.c
+++ b/app/display/gimpdisplayshell-close.c
@@ -172,19 +172,17 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
GTK_WIDGET (shell),
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
+
+ file ?
+ _("_Save") :
+ _("Save _As"), RESPONSE_SAVE,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Discard Changes"), GTK_RESPONSE_CLOSE,
NULL);
- g_free (title);
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- (file ?
- GTK_STOCK_SAVE :
- GTK_STOCK_SAVE_AS), RESPONSE_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Discard Changes"), GTK_RESPONSE_CLOSE,
- NULL);
+ g_free (title);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
RESPONSE_SAVE,
GTK_RESPONSE_CLOSE,
diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c
index cdd9fdc..4cefc7e 100644
--- a/app/display/gimpdisplayshell-filter-dialog.c
+++ b/app/display/gimpdisplayshell-filter-dialog.c
@@ -84,8 +84,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
gimp_standard_help_func,
GIMP_HELP_DISPLAY_FILTER_DIALOG,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/display/gimpdisplayshell-rotate-dialog.c b/app/display/gimpdisplayshell-rotate-dialog.c
index 94a2503..346ac9b 100644
--- a/app/display/gimpdisplayshell-rotate-dialog.c
+++ b/app/display/gimpdisplayshell-rotate-dialog.c
@@ -118,9 +118,9 @@ gimp_display_shell_rotate_dialog (GimpDisplayShell *shell)
gimp_standard_help_func,
GIMP_HELP_VIEW_ROTATE_OTHER,
- 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);
diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c
index 89532ff..b86c5c0 100644
--- a/app/display/gimpdisplayshell-scale-dialog.c
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -119,8 +119,8 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
gimp_standard_help_func,
GIMP_HELP_VIEW_ZOOM_OTHER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 469a024..98245ea 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -188,7 +188,9 @@ gui_abort (const gchar *abort_message)
dialog = gimp_dialog_new (_("GIMP Message"), "gimp-abort",
NULL, GTK_DIALOG_MODAL, NULL, NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+
+ _("_OK"), GTK_RESPONSE_OK,
+
NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 8b92b04..2a6f435 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -345,7 +345,7 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
gimp_widget_get_monitor (GTK_WIDGET (shell)),
TRUE,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
index c63621b..7160969 100644
--- a/app/tools/gimpfiltertool.c
+++ b/app/tools/gimpfiltertool.c
@@ -352,9 +352,9 @@ gimp_filter_tool_initialize (GimpTool *tool,
gimp_widget_get_monitor (GTK_WIDGET (shell)),
filter_tool->overlay,
- 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);
diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c
index e04581c..a27c35f 100644
--- a/app/tools/gimpfliptool.c
+++ b/app/tools/gimpfliptool.c
@@ -97,11 +97,13 @@ gimp_flip_tool_class_init (GimpFlipToolClass *klass)
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
GimpTransformToolClass *trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
- tool_class->modifier_key = gimp_flip_tool_modifier_key;
- tool_class->cursor_update = gimp_flip_tool_cursor_update;
+ tool_class->modifier_key = gimp_flip_tool_modifier_key;
+ tool_class->cursor_update = gimp_flip_tool_cursor_update;
- trans_class->get_undo_desc = gimp_flip_tool_get_undo_desc;
- trans_class->transform = gimp_flip_tool_transform;
+ trans_class->get_undo_desc = gimp_flip_tool_get_undo_desc;
+ trans_class->transform = gimp_flip_tool_transform;
+
+ trans_class->ok_button_label = _("_Flip");
}
static void
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index 4e6ebd7..dd79976 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -305,8 +305,10 @@ gimp_foreground_select_tool_initialize (GimpTool *tool,
gtk_widget_get_screen (GTK_WIDGET (shell)),
gimp_widget_get_monitor (GTK_WIDGET (shell)),
TRUE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GIMP_STOCK_TOOL_FOREGROUND_SELECT, GTK_RESPONSE_APPLY,
+
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Select"), GTK_RESPONSE_APPLY,
+
NULL);
gimp_tool_gui_set_auto_overlay (fg_select->gui, TRUE);
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index f6cc417..daa6a6e 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -1076,7 +1076,7 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
gimp_widget_get_monitor (GTK_WIDGET (shell)),
TRUE,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 1caccbe..1da4086 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -105,14 +105,16 @@ gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
GimpTransformToolClass *trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
- tool_class->key_press = gimp_rotate_tool_key_press;
-
- trans_class->dialog = gimp_rotate_tool_dialog;
- trans_class->dialog_update = gimp_rotate_tool_dialog_update;
- trans_class->prepare = gimp_rotate_tool_prepare;
- trans_class->motion = gimp_rotate_tool_motion;
- trans_class->recalc_matrix = gimp_rotate_tool_recalc_matrix;
- trans_class->get_undo_desc = gimp_rotate_tool_get_undo_desc;
+ tool_class->key_press = gimp_rotate_tool_key_press;
+
+ trans_class->dialog = gimp_rotate_tool_dialog;
+ trans_class->dialog_update = gimp_rotate_tool_dialog_update;
+ trans_class->prepare = gimp_rotate_tool_prepare;
+ trans_class->motion = gimp_rotate_tool_motion;
+ trans_class->recalc_matrix = gimp_rotate_tool_recalc_matrix;
+ trans_class->get_undo_desc = gimp_rotate_tool_get_undo_desc;
+
+ trans_class->ok_button_label = _("R_otate");
}
static void
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index 3e9863b..ef2db05 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -100,12 +100,14 @@ gimp_scale_tool_class_init (GimpScaleToolClass *klass)
{
GimpTransformToolClass *trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
- trans_class->dialog = gimp_scale_tool_dialog;
- trans_class->dialog_update = gimp_scale_tool_dialog_update;
- trans_class->prepare = gimp_scale_tool_prepare;
- trans_class->motion = gimp_scale_tool_motion;
- trans_class->recalc_matrix = gimp_scale_tool_recalc_matrix;
- trans_class->get_undo_desc = gimp_scale_tool_get_undo_desc;
+ trans_class->dialog = gimp_scale_tool_dialog;
+ trans_class->dialog_update = gimp_scale_tool_dialog_update;
+ trans_class->prepare = gimp_scale_tool_prepare;
+ trans_class->motion = gimp_scale_tool_motion;
+ trans_class->recalc_matrix = gimp_scale_tool_recalc_matrix;
+ trans_class->get_undo_desc = gimp_scale_tool_get_undo_desc;
+
+ trans_class->ok_button_label = _("_Scale");
}
static void
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index ce6fa26..df41248 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -97,12 +97,14 @@ gimp_shear_tool_class_init (GimpShearToolClass *klass)
{
GimpTransformToolClass *trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
- trans_class->dialog = gimp_shear_tool_dialog;
- trans_class->dialog_update = gimp_shear_tool_dialog_update;
- trans_class->prepare = gimp_shear_tool_prepare;
- trans_class->motion = gimp_shear_tool_motion;
- trans_class->recalc_matrix = gimp_shear_tool_recalc_matrix;
- trans_class->get_undo_desc = gimp_shear_tool_get_undo_desc;
+ trans_class->dialog = gimp_shear_tool_dialog;
+ trans_class->dialog_update = gimp_shear_tool_dialog_update;
+ trans_class->prepare = gimp_shear_tool_prepare;
+ trans_class->motion = gimp_shear_tool_motion;
+ trans_class->recalc_matrix = gimp_shear_tool_recalc_matrix;
+ trans_class->get_undo_desc = gimp_shear_tool_get_undo_desc;
+
+ trans_class->ok_button_label = _("_Shear");
}
static void
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 2a1072f..a044b95 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -1525,8 +1525,8 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
gimp_standard_help_func, NULL,
_("Create _New Layer"), RESPONSE_NEW,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_EDIT, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Edit"), GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index f4a4d44..a8ded8d 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -217,6 +217,8 @@ gimp_transform_tool_class_init (GimpTransformToolClass *klass)
klass->transform = gimp_transform_tool_real_transform;
klass->pick_function = gimp_transform_tool_real_pick_function;
klass->draw_gui = gimp_transform_tool_real_draw_gui;
+
+ klass->ok_button_label = _("_Transform");
}
static void
@@ -1643,7 +1645,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
GimpTool *tool = GIMP_TOOL (tr_tool);
GimpToolInfo *tool_info = tool->tool_info;
GimpDisplayShell *shell;
- const gchar *icon_name;
+ const gchar *ok_button_label;
if (! GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->dialog)
return;
@@ -1652,7 +1654,7 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
shell = gimp_display_get_shell (tool->display);
- icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+ ok_button_label = GIMP_TRANSFORM_TOOL_GET_CLASS (tr_tool)->ok_button_label;
tr_tool->gui = gimp_tool_gui_new (tool_info,
NULL, NULL, NULL, NULL,
@@ -1660,9 +1662,9 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
gimp_widget_get_monitor (GTK_WIDGET (shell)),
TRUE,
- GIMP_STOCK_RESET, RESPONSE_RESET,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- icon_name, GTK_RESPONSE_OK,
+ _("_Reset"), RESPONSE_RESET,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ ok_button_label, GTK_RESPONSE_OK,
NULL);
diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h
index 2b6a86a..4d78099 100644
--- a/app/tools/gimptransformtool.h
+++ b/app/tools/gimptransformtool.h
@@ -157,6 +157,8 @@ struct _GimpTransformToolClass
GimpColorProfile **buffer_profile,
gint *new_offset_x,
gint *new_offset_y);
+
+ const gchar *ok_button_label;
};
diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c
index da872fb..3a959b6 100644
--- a/app/widgets/gimpactionview.c
+++ b/app/widgets/gimpactionview.c
@@ -671,8 +671,8 @@ gimp_action_view_conflict_confirm (GimpActionView *view,
gtk_widget_get_toplevel (GTK_WIDGET (view)), 0,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Reassign shortcut"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Reassign Shortcut"), GTK_RESPONSE_OK,
NULL);
@@ -680,6 +680,7 @@ gimp_action_view_conflict_confirm (GimpActionView *view,
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
+
g_signal_connect (dialog, "response",
G_CALLBACK (gimp_action_view_conflict_response),
confirm_data);
diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c
index 67ef7a6..5e1a8b3 100644
--- a/app/widgets/gimpcolordialog.c
+++ b/app/widgets/gimpcolordialog.c
@@ -105,10 +105,13 @@ static void
gimp_color_dialog_init (GimpColorDialog *dialog)
{
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- 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);
+
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index dd1e3ab..0de4c9a 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -662,8 +662,8 @@ gimp_controller_editor_edit_clicked (GtkWidget *button,
gimp_standard_help_func,
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index d073846..97fa72d 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -564,9 +564,9 @@ gimp_controller_list_remove_clicked (GtkWidget *button,
GTK_WIDGET (list), GTK_DIALOG_MODAL,
NULL, NULL,
- _("Disable Controller"), RESPONSE_DISABLE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Remove Controller"), GTK_RESPONSE_OK,
+ _("_Disable Controller"), RESPONSE_DISABLE,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Remove Controller"), GTK_RESPONSE_OK,
NULL);
@@ -641,7 +641,7 @@ gimp_controller_list_edit_clicked (GtkWidget *button,
gimp_standard_help_func,
GIMP_HELP_PREFS_INPUT_CONTROLLERS,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index 4346033..ec9e79d 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -505,8 +505,8 @@ gimp_device_editor_delete_clicked (GtkWidget *button,
GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/widgets/gimpdnd-xds.c b/app/widgets/gimpdnd-xds.c
index 45d26b2..34af288 100644
--- a/app/widgets/gimpdnd-xds.c
+++ b/app/widgets/gimpdnd-xds.c
@@ -224,8 +224,8 @@ gimp_file_overwrite_dialog (GtkWidget *parent,
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
gimp_standard_help_func, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("_Replace"), GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Replace"), GTK_RESPONSE_OK,
NULL);
diff --git a/app/widgets/gimperrordialog.c b/app/widgets/gimperrordialog.c
index 3501e44..7810c4f 100644
--- a/app/widgets/gimperrordialog.c
+++ b/app/widgets/gimperrordialog.c
@@ -64,7 +64,9 @@ gimp_error_dialog_init (GimpErrorDialog *dialog)
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-message");
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_OK, GTK_RESPONSE_CLOSE,
+
+ _("_OK"), GTK_RESPONSE_CLOSE,
+
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
diff --git a/app/widgets/gimpexportdialog.c b/app/widgets/gimpexportdialog.c
index 50eee75..ac0cec8 100644
--- a/app/widgets/gimpexportdialog.c
+++ b/app/widgets/gimpexportdialog.c
@@ -69,7 +69,7 @@ gimp_export_dialog_new (Gimp *gimp)
"title", _("Export Image"),
"role", "gimp-file-export",
"help-id", GIMP_HELP_FILE_EXPORT_AS,
- "stock-id", _("_Export"),
+ "ok-button-label", _("_Export"),
"automatic-label", _("By Extension"),
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index fd0c7c6..2564f07 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -55,7 +55,7 @@ enum
PROP_0,
PROP_GIMP,
PROP_HELP_ID,
- PROP_STOCK_ID,
+ PROP_OK_BUTTON_LABEL,
PROP_AUTOMATIC_HELP_ID,
PROP_AUTOMATIC_LABEL,
PROP_FILE_FILTER_LABEL,
@@ -182,9 +182,10 @@ gimp_file_dialog_class_init (GimpFileDialogClass *klass)
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property (object_class, PROP_STOCK_ID,
- g_param_spec_string ("stock-id", NULL, NULL,
- NULL,
+ g_object_class_install_property (object_class, PROP_OK_BUTTON_LABEL,
+ g_param_spec_string ("ok-button-label",
+ NULL, NULL,
+ _("_OK"),
GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
@@ -229,7 +230,6 @@ gimp_file_dialog_class_init (GimpFileDialogClass *klass)
static void
gimp_file_dialog_init (GimpFileDialog *dialog)
{
- dialog->stock_id = GTK_STOCK_OK;
}
static void
@@ -261,8 +261,8 @@ gimp_file_dialog_set_property (GObject *object,
case PROP_HELP_ID:
dialog->help_id = g_value_dup_string (value);
break;
- case PROP_STOCK_ID:
- dialog->stock_id = g_value_dup_string (value);
+ case PROP_OK_BUTTON_LABEL:
+ dialog->ok_button_label = g_value_dup_string (value);
break;
case PROP_AUTOMATIC_HELP_ID:
dialog->automatic_help_id = g_value_dup_string (value);
@@ -321,9 +321,10 @@ gimp_file_dialog_constructed (GObject *object)
G_OBJECT_CLASS (parent_class)->constructed (object);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- dialog->stock_id, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ dialog->ok_button_label, GTK_RESPONSE_OK,
NULL);
+
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
@@ -341,9 +342,12 @@ gimp_file_dialog_constructed (GObject *object)
if (GIMP_GUI_CONFIG (dialog->gimp->config)->show_help_button)
{
- GtkWidget *action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
- GtkWidget *button = gtk_button_new_from_stock (GTK_STOCK_HELP);
+ GtkWidget *action_area;
+ GtkWidget *button;
+
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+ button = gtk_button_new_with_mnemonic (_("_Help"));
gtk_box_pack_end (GTK_BOX (action_area), button, FALSE, TRUE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
button, TRUE);
@@ -393,9 +397,9 @@ gimp_file_dialog_dispose (GObject *object)
g_free (dialog->help_id);
dialog->help_id = NULL;
- if (dialog->stock_id)
- g_free (dialog->stock_id);
- dialog->stock_id = NULL;
+ if (dialog->ok_button_label)
+ g_free (dialog->ok_button_label);
+ dialog->ok_button_label = NULL;
if (dialog->automatic_help_id)
g_free (dialog->automatic_help_id);
diff --git a/app/widgets/gimpfiledialog.h b/app/widgets/gimpfiledialog.h
index 9108926..fff784e 100644
--- a/app/widgets/gimpfiledialog.h
+++ b/app/widgets/gimpfiledialog.h
@@ -53,7 +53,7 @@ struct _GimpFileDialog
gboolean canceled;
gchar *help_id;
- gchar *stock_id;
+ gchar *ok_button_label;
gchar *automatic_help_id;
gchar *automatic_label;
gchar *file_filter_label;
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
index cc3550d..b08bcaa 100644
--- a/app/widgets/gimphelp.c
+++ b/app/widgets/gimphelp.c
@@ -383,7 +383,7 @@ gimp_help_browser_error (Gimp *gimp,
NULL, 0,
NULL, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("Use _Web Browser"), GTK_RESPONSE_OK,
NULL);
@@ -713,25 +713,21 @@ static void
gimp_help_query_user_manual_online (GimpIdleHelp *idle_help)
{
GtkWidget *dialog;
- GtkWidget *button;
dialog = gimp_message_dialog_new (_("GIMP user manual is missing"),
GIMP_STOCK_USER_MANUAL,
NULL, 0, NULL, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
- button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("_Read Online"), GTK_RESPONSE_ACCEPT);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name (GIMP_STOCK_WEB,
- GTK_ICON_SIZE_BUTTON));
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("Read _Online"), GTK_RESPONSE_ACCEPT,
+
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (idle_help->progress)
{
diff --git a/app/widgets/gimpiconpicker.c b/app/widgets/gimpiconpicker.c
index 36868ac..fcb52eb 100644
--- a/app/widgets/gimpiconpicker.c
+++ b/app/widgets/gimpiconpicker.c
@@ -512,8 +512,10 @@ gimp_icon_picker_menu_from_file (GtkWidget *widget,
dialog = gtk_file_chooser_dialog_new (_("Load Icon Image"),
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
+
NULL);
filter = gtk_file_filter_new ();
@@ -534,8 +536,10 @@ gimp_icon_picker_menu_from_file (GtkWidget *widget,
gimp_icon_picker_set_icon_pixbuf (picker, icon_pixbuf);
g_object_unref (icon_pixbuf);
}
+
g_free (filename);
}
+
gtk_widget_destroy (dialog);
}
diff --git a/app/widgets/gimpopendialog.c b/app/widgets/gimpopendialog.c
index c436083..92c25b6 100644
--- a/app/widgets/gimpopendialog.c
+++ b/app/widgets/gimpopendialog.c
@@ -66,7 +66,7 @@ gimp_open_dialog_new (Gimp *gimp)
"title", _("Open Image"),
"role", "gimp-file-open",
"help-id", GIMP_HELP_FILE_OPEN,
- "stock-id", GTK_STOCK_OPEN,
+ "ok-button-label", _("_Open"),
"automatic-label", _("Automatically Detected"),
"automatic-help-id", GIMP_HELP_FILE_OPEN_BY_EXTENSION,
diff --git a/app/widgets/gimppdbdialog.c b/app/widgets/gimppdbdialog.c
index dde48ce..05337f1 100644
--- a/app/widgets/gimppdbdialog.c
+++ b/app/widgets/gimppdbdialog.c
@@ -172,7 +172,7 @@ gimp_pdb_dialog_init (GimpPdbDialog *dialog,
klass->dialogs = g_list_prepend (klass->dialogs, dialog);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ _("_Close"), GTK_RESPONSE_CLOSE);
}
static void
diff --git a/app/widgets/gimpprogressdialog.c b/app/widgets/gimpprogressdialog.c
index 1285314..2dda68f 100644
--- a/app/widgets/gimpprogressdialog.c
+++ b/app/widgets/gimpprogressdialog.c
@@ -88,7 +88,7 @@ gimp_progress_dialog_init (GimpProgressDialog *dialog)
&dialog->box);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_widget_set_size_request (GTK_WIDGET (dialog), PROGRESS_DIALOG_WIDTH, -1);
diff --git a/app/widgets/gimpsavedialog.c b/app/widgets/gimpsavedialog.c
index afe18c3..565fe84 100644
--- a/app/widgets/gimpsavedialog.c
+++ b/app/widgets/gimpsavedialog.c
@@ -138,7 +138,7 @@ gimp_save_dialog_new (Gimp *gimp)
"title", _("Save Image"),
"role", "gimp-file-save",
"help-id", GIMP_HELP_FILE_SAVE,
- "stock-id", GTK_STOCK_SAVE,
+ "ok-button-label", _("_Save"),
"automatic-label", _("By Extension"),
"automatic-help-id", GIMP_HELP_FILE_SAVE_BY_EXTENSION,
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index b37c44e..8e902f9 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -693,7 +693,7 @@ gimp_settings_box_manage_activate (GtkWidget *widget,
toplevel, 0,
NULL, NULL,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
@@ -764,12 +764,13 @@ gimp_settings_box_file_dialog (GimpSettingsBox *box,
GTK_FILE_CHOOSER_ACTION_SAVE :
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- save ? GTK_STOCK_SAVE : GTK_STOCK_OPEN,
- GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ save ?
+ _("_Save") : _("_Open"), GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
@@ -779,15 +780,13 @@ gimp_settings_box_file_dialog (GimpSettingsBox *box,
gtk_window_set_role (GTK_WINDOW (dialog), "gimp-import-export-settings");
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer) &private->file_dialog);
g_signal_connect (toplevel, "unmap",
G_CALLBACK (gimp_settings_box_toplevel_unmap),
dialog);
- gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
if (save)
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
TRUE);
diff --git a/app/widgets/gimptexteditor.c b/app/widgets/gimptexteditor.c
index 43b519d..afac651 100644
--- a/app/widgets/gimptexteditor.c
+++ b/app/widgets/gimptexteditor.c
@@ -162,7 +162,7 @@ gimp_text_editor_new (const gchar *title,
NULL);
gtk_dialog_add_button (GTK_DIALOG (editor),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ _("_Close"), GTK_RESPONSE_CLOSE);
g_signal_connect (editor, "response",
G_CALLBACK (gtk_widget_destroy),
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 75b57f9..646c0e6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -85,6 +85,7 @@ app/actions/vectors-commands.c
app/actions/view-actions.c
app/actions/view-commands.c
app/actions/window-actions.c
+app/actions/window-commands.c
app/actions/windows-actions.c
app/actions/windows-commands.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
