[gimp] libgimp*: 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] libgimp*: get rid of icons in dialog buttons (use labels not stock IDs)
- Date: Sun, 12 Feb 2017 15:25:08 +0000 (UTC)
commit 40981f43cf5b7af6b65c997bb542136c5f280861
Author: Michael Natterer <mitch gimp org>
Date: Sun Feb 12 16:10:50 2017 +0100
libgimp*: get rid of icons in dialog buttons (use labels not stock IDs)
libgimp/gimpexport.c | 24 ++++++++++--------------
libgimp/gimpimagemetadata.c | 4 ++--
libgimpwidgets/gimpcolorbutton.c | 6 +++---
libgimpwidgets/gimpcolorprofilechooserdialog.c | 8 ++++----
libgimpwidgets/gimpdialog.c | 4 +++-
libgimpwidgets/gimpfileentry.c | 4 ++--
libgimpwidgets/gimpquerybox.c | 8 ++++----
libgimpwidgets/gimpunitmenu.c | 4 ++--
po-libgimp/POTFILES.in | 1 +
9 files changed, 31 insertions(+), 32 deletions(-)
---
diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c
index c3f3fcc..eefd2e0 100644
--- a/libgimp/gimpexport.c
+++ b/libgimp/gimpexport.c
@@ -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,
diff --git a/libgimp/gimpimagemetadata.c b/libgimp/gimpimagemetadata.c
index 3ce9a10..cba7a7d 100644
--- a/libgimp/gimpimagemetadata.c
+++ b/libgimp/gimpimagemetadata.c
@@ -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);
diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c
index c9e6f74..118eb8f 100644
--- a/libgimpwidgets/gimpcolorbutton.c
+++ b/libgimpwidgets/gimpcolorbutton.c
@@ -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);
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.c b/libgimpwidgets/gimpcolorprofilechooserdialog.c
index f20f606..5493049 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.c
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.c
@@ -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);
}
diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c
index 7255ee4..af652a8 100644
--- a/libgimpwidgets/gimpdialog.c
+++ b/libgimpwidgets/gimpdialog.c
@@ -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);
diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c
index 236bf49..d8e7b1f 100644
--- a/libgimpwidgets/gimpfileentry.c
+++ b/libgimpwidgets/gimpfileentry.c
@@ -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);
diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c
index 6c8489a..badea02 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -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);
diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c
index dd45b70..fff43b9 100644
--- a/libgimpwidgets/gimpunitmenu.c
+++ b/libgimpwidgets/gimpunitmenu.c
@@ -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);
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index 020c9f8..28582a3 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
