[glade] Replaced deprecated stock items with its corresponding label strings.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Replaced deprecated stock items with its corresponding label strings.
- Date: Thu, 15 May 2014 21:23:10 +0000 (UTC)
commit 686ebc7babf583191666c031106d0f4adb29d933
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Thu May 15 16:06:16 2014 -0300
Replaced deprecated stock items with its corresponding label strings.
gladeui/glade-editor-property.c | 48 +++++++++++++++++----------------------
gladeui/glade-editor.c | 6 ++--
gladeui/glade-utils.c | 5 +--
plugins/gtk+/glade-accels.c | 6 ++--
plugins/gtk+/glade-attributes.c | 6 ++--
src/glade-window.c | 7 ++---
6 files changed, 35 insertions(+), 43 deletions(-)
---
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 5facb39..4f98c92 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -1317,8 +1317,7 @@ glade_eprop_flags_show_dialog (GladeEditorProperty *eprop)
dialog = gtk_dialog_new_with_buttons (_("Select Fields"),
GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
@@ -1691,9 +1690,8 @@ glade_eprop_named_icon_show_chooser_dialog (GladeEditorProperty *eprop)
GTK_WINDOW
(gtk_widget_get_toplevel
(GTK_WIDGET (eprop))),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -1998,9 +1996,9 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
parent ?
GTK_WINDOW (gtk_widget_get_toplevel
(parent)) : NULL,
- GTK_DIALOG_MODAL, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_OK,
- GTK_RESPONSE_OK, NULL);
+ GTK_DIALOG_MODAL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -2206,8 +2204,8 @@ glade_editor_property_show_resource_dialog (GladeProject *project,
parent ?
GTK_WINDOW (gtk_widget_get_toplevel (parent))
: NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -3150,9 +3148,9 @@ glade_editor_property_show_object_dialog (GladeProject *project,
dialog = gtk_dialog_new_with_buttons (title,
GTK_WINDOW (parent),
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR, GLADE_RESPONSE_CLEAR,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
@@ -3269,12 +3267,10 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop)
dialog = gtk_dialog_new_with_buttons (title,
GTK_WINDOW (parent),
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR,
- GLADE_RESPONSE_CLEAR, _("_New"),
- GLADE_RESPONSE_CREATE, GTK_STOCK_OK,
- GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_New"), GLADE_RESPONSE_CREATE,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
g_free (title);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
@@ -3288,11 +3284,9 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop)
dialog = gtk_dialog_new_with_buttons (title,
GTK_WINDOW (parent),
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR,
- GLADE_RESPONSE_CLEAR, GTK_STOCK_OK,
- GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
g_free (title);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
@@ -3606,9 +3600,9 @@ glade_eprop_objects_show_dialog (GladeEditorProperty *eprop)
GTK_WINDOW (parent),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLEAR, GLADE_RESPONSE_CLEAR,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
g_free (title);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index 4574802..427101e 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -747,7 +747,7 @@ glade_editor_query_dialog (GladeWidget *widget)
dialog = gtk_dialog_new_with_buttons (title, NULL,
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
g_free (title);
@@ -1103,8 +1103,8 @@ glade_editor_reset_dialog_run (GtkWidget *parent, GladeWidget *gwidget)
parent ? GTK_WINDOW (parent) : NULL,
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index 6fddc3e..d69407d 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -465,11 +465,10 @@ glade_util_file_dialog_new (const gchar *title,
GLADE_IS_PROJECT (project)), NULL);
file_dialog = gtk_file_chooser_dialog_new (title, parent, action,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
action ==
GLADE_FILE_DIALOG_ACTION_OPEN ?
- GTK_STOCK_OPEN : GTK_STOCK_SAVE,
+ _("_Open") : _("_Save"),
GTK_RESPONSE_OK, NULL);
file_filter = gtk_file_filter_new ();
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c
index d596701..d561510 100644
--- a/plugins/gtk+/glade-accels.c
+++ b/plugins/gtk+/glade-accels.c
@@ -521,9 +521,9 @@ glade_eprop_accel_show_dialog (GladeEditorProperty *eprop)
GTK_WINDOW (parent),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLEAR, GLADE_RESPONSE_CLEAR,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
diff --git a/plugins/gtk+/glade-attributes.c b/plugins/gtk+/glade-attributes.c
index 523cce8..fb8fc6d 100644
--- a/plugins/gtk+/glade-attributes.c
+++ b/plugins/gtk+/glade-attributes.c
@@ -1058,9 +1058,9 @@ glade_eprop_attrs_show_dialog (GtkWidget *dialog_button,
GTK_WINDOW (parent),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLEAR, GLADE_RESPONSE_CLEAR,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ _("C_lear"), GLADE_RESPONSE_CLEAR,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_OK, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
diff --git a/src/glade-window.c b/src/glade-window.c
index f73468a..7349f3b 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -1470,8 +1470,8 @@ confirm_close_project (GladeWindow *window, GladeProject *project)
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Close _without Saving"), GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_YES, NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_YES, NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_YES,
@@ -2646,8 +2646,7 @@ check_reload_project (GladeWindow *window, GladeProject *project)
GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_REJECT);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
GTK_RESPONSE_ACCEPT);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
