From 08660a29ff88d89581b85a9eef767cad7305d890 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Sat, 17 Jun 2017 12:16:54 +0100 Subject: [PATCH] Change dialog buttons from using GKT_STOCK_ labels Remove GTK_STOCK_... from dialog buttons as it is depreciated and replace with text labels. --- .../gnc-plugin-page-owner-tree.c | 4 +-- src/business/business-ledger/gncEntryLedger.c | 2 +- .../business-ledger/gncEntryLedgerControl.c | 2 +- src/gnome-search/dialog-search.c | 4 +-- src/gnome-search/search-account.c | 4 +-- src/gnome-utils/dialog-account.c | 4 +-- src/gnome-utils/gnc-file.c | 26 +++++++++---------- src/gnome-utils/gnc-gui-query.c | 4 +-- src/gnome-utils/gnc-main-window.c | 4 +-- src/gnome-utils/gnc-recurrence.c | 8 +++--- src/gnome-utils/gnc-tree-control-split-reg.c | 12 ++++----- src/gnome-utils/gnc-tree-view-split-reg.c | 2 +- src/gnome/dialog-commodities.c | 4 +-- src/gnome/dialog-price-edit-db.c | 4 +-- src/gnome/dialog-tax-info.c | 4 +-- src/gnome/gnc-plugin-budget.c | 4 +-- src/gnome/gnc-plugin-page-account-tree.c | 4 +-- src/gnome/gnc-plugin-page-register.c | 6 ++--- src/gnome/gnc-plugin-page-register2.c | 6 ++--- src/gnome/gnc-split-reg.c | 24 ++++++++--------- .../csv-exp/assistant-csv-export.c | 2 +- .../csv-imp/assistant-csv-account-import.c | 6 ++--- src/plugins/bi_import/dialog-bi-import-gui.c | 6 ++--- .../dialog-customer-import-gui.c | 6 ++--- .../ledger-core/split-register-control.c | 2 +- 25 files changed, 78 insertions(+), 76 deletions(-) diff --git a/src/business/business-gnome/gnc-plugin-page-owner-tree.c b/src/business/business-gnome/gnc-plugin-page-owner-tree.c index 73757e0476..1d54611d01 100644 --- a/src/business/business-gnome/gnc-plugin-page-owner-tree.c +++ b/src/business/business-gnome/gnc-plugin-page-owner-tree.c @@ -1076,8 +1076,8 @@ gnc_plugin_page_owner_tree_cmd_delete_owner (GtkAction *action, GncPluginPageOwn "%s", message); g_free(message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_ACCEPT, (gchar *)NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); response = gtk_dialog_run(GTK_DIALOG(dialog)); diff --git a/src/business/business-ledger/gncEntryLedger.c b/src/business/business-ledger/gncEntryLedger.c index f2f28b2a4d..1c6243e538 100644 --- a/src/business/business-ledger/gncEntryLedger.c +++ b/src/business/business-ledger/gncEntryLedger.c @@ -915,7 +915,7 @@ gnc_entry_ledger_duplicate_current_entry (GncEntryLedger *ledger) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, _("_Record"), GTK_RESPONSE_ACCEPT, NULL); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_DUP); diff --git a/src/business/business-ledger/gncEntryLedgerControl.c b/src/business/business-ledger/gncEntryLedgerControl.c index 7233fed143..a948de5470 100644 --- a/src/business/business-ledger/gncEntryLedgerControl.c +++ b/src/business/business-ledger/gncEntryLedgerControl.c @@ -896,7 +896,7 @@ static gboolean gnc_entry_ledger_traverse (VirtualLocation *p_new_virt_loc, "%s", message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), _("_Don't Record"), GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, _("_Record"), GTK_RESPONSE_ACCEPT, NULL); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_MOD); diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index e0e59c5631..2bab99029a 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -723,7 +723,7 @@ attach_element (GtkWidget *element, GNCSearchWindow *sw, int row) GTK_EXPAND | GTK_FILL, 0, 0, 0); - remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + remove = gtk_button_new_with_label (_("Remove")); g_object_set_data (G_OBJECT (remove), "element", element); g_signal_connect (G_OBJECT (remove), "clicked", G_CALLBACK (remove_element), sw); gtk_table_attach (GTK_TABLE (sw->criteria_table), remove, 1, 2, row, row + 1, @@ -1135,7 +1135,7 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw, const gchar *title) gtk_label_set_text (GTK_LABEL (label), type_label); /* Set the 'add criterion' button */ - add = gtk_button_new_from_stock (GTK_STOCK_ADD); + add = gtk_button_new_with_label (_("Add")); g_signal_connect (G_OBJECT (add), "clicked", G_CALLBACK (add_criterion), sw); box = GTK_WIDGET(gtk_builder_get_object (builder, "add_button_box")); diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index 9ec6579e22..dd6a7c9df7 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -258,8 +258,8 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi) GTK_DIALOG(gtk_dialog_new_with_buttons(_("Select the Accounts to Compare"), NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("OK"), GTK_RESPONSE_OK, NULL)); /* Put the dialog together */ diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index f821474e6f..a92f52ba59 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -643,8 +643,8 @@ verify_children_compatible (AccountWindow *aw) GTK_WINDOW(aw->dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("OK"), GTK_RESPONSE_OK, NULL); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE); diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c index 881fe11a16..fc6b5b6bc8 100644 --- a/src/gnome-utils/gnc-file.c +++ b/src/gnome-utils/gnc-file.c @@ -84,7 +84,7 @@ gnc_file_dialog (const char * title, GtkWidget *file_box; const char *internal_name; char *file_name = NULL; - gchar * okbutton = GTK_STOCK_OPEN; + gchar * okbutton = _("Open"); const gchar *ok_icon = NULL; GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; gint response; @@ -95,7 +95,7 @@ gnc_file_dialog (const char * title, { case GNC_FILE_DIALOG_OPEN: action = GTK_FILE_CHOOSER_ACTION_OPEN; - okbutton = GTK_STOCK_OPEN; + okbutton = _("Open"); if (title == NULL) title = _("Open"); break; @@ -107,7 +107,7 @@ gnc_file_dialog (const char * title, break; case GNC_FILE_DIALOG_SAVE: action = GTK_FILE_CHOOSER_ACTION_SAVE; - okbutton = GTK_STOCK_SAVE; + okbutton = _("Save"); if (title == NULL) title = _("Save"); break; @@ -125,7 +125,7 @@ gnc_file_dialog (const char * title, title, NULL, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, NULL); if (ok_icon) gnc_gtk_dialog_add_button(file_box, okbutton, ok_icon, GTK_RESPONSE_ACCEPT); @@ -270,7 +270,7 @@ show_session_error (QofBackendError io_error, { case GNC_FILE_DIALOG_OPEN: default: - label = GTK_STOCK_OPEN; + label = _("Open"); fmt = _("GnuCash could not obtain the lock for %s. " "That database may be in use by another user, " "in which case you should not open the database. " @@ -286,7 +286,7 @@ show_session_error (QofBackendError io_error, break; case GNC_FILE_DIALOG_SAVE: - label = GTK_STOCK_SAVE; + label = _("Save"); fmt = _("GnuCash could not obtain the lock for %s. " "That database may be in use by another user, " "in which case you should not save the database. " @@ -309,7 +309,7 @@ show_session_error (QofBackendError io_error, fmt, displayname); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, label, GTK_RESPONSE_YES, NULL); if (parent == NULL) @@ -607,9 +607,9 @@ gnc_file_query_save (gboolean can_cancel) if (can_cancel) gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_SAVE, GTK_RESPONSE_YES); + _("Save"), GTK_RESPONSE_YES); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES); @@ -791,14 +791,14 @@ RESTART: gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE); gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"), - GTK_STOCK_REVERT_TO_SAVED, RESPONSE_READONLY); + _("Revert"), RESPONSE_READONLY); gnc_gtk_dialog_add_button(dialog, _("_Create New File"), - GTK_STOCK_NEW, RESPONSE_NEW); + _("New"), RESPONSE_NEW); gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"), - GTK_STOCK_OPEN, RESPONSE_OPEN); + _("Open"), RESPONSE_OPEN); if (shutdown_cb) gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_QUIT, RESPONSE_QUIT); + _("Quit"), RESPONSE_QUIT); rc = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free (displayname); diff --git a/src/gnome-utils/gnc-gui-query.c b/src/gnome-utils/gnc-gui-query.c index 6f7aa690c8..5d67a357eb 100644 --- a/src/gnome-utils/gnc-gui-query.c +++ b/src/gnome-utils/gnc-gui-query.c @@ -342,10 +342,10 @@ gnc_choose_radio_option_dialog(GtkWidget *parent, } if (!button_name) - button_name = GTK_STOCK_OK; + button_name = _("OK"); dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, button_name, GTK_RESPONSE_OK, NULL); diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 7c4ce69771..d9246462b0 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -1256,8 +1256,8 @@ gnc_main_window_prompt_for_save (GtkWidget *window) } gtk_dialog_add_buttons(GTK_DIALOG(dialog), _("Close _Without Saving"), GTK_RESPONSE_CLOSE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_APPLY, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_APPLY); diff --git a/src/gnome-utils/gnc-recurrence.c b/src/gnome-utils/gnc-recurrence.c index 08546d9399..64662cb068 100644 --- a/src/gnome-utils/gnc-recurrence.c +++ b/src/gnome-utils/gnc-recurrence.c @@ -23,9 +23,11 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * *******************************************************************/ +#include "config.h" #include -#include "config.h" +#include + #include "dialog-utils.h" #include "gnc-recurrence.h" #include "gnc-date-edit.h" @@ -541,10 +543,10 @@ gnc_recurrence_comp_init(GncRecurrenceComp *grc) gtk_box_set_homogeneous (GTK_BOX (grc->vbox), FALSE); grc->rlist = NULL; - grc->buttAdd = GTK_BUTTON(gtk_button_new_from_stock(GTK_STOCK_ADD)); + grc->buttAdd = GTK_BUTTON(gtk_button_new_with_label(_("Add"))); g_signal_connect(G_OBJECT(grc->buttAdd), "clicked", G_CALLBACK(addClicked), grc); - grc->buttRemove = GTK_BUTTON(gtk_button_new_from_stock(GTK_STOCK_REMOVE)); + grc->buttRemove = GTK_BUTTON(gtk_button_new_with_label(_("Remove"))); g_signal_connect(G_OBJECT(grc->buttRemove), "clicked", G_CALLBACK(removeClicked), grc); diff --git a/src/gnome-utils/gnc-tree-control-split-reg.c b/src/gnome-utils/gnc-tree-control-split-reg.c index fa9b74c211..25eda8769b 100644 --- a/src/gnome-utils/gnc-tree-control-split-reg.c +++ b/src/gnome-utils/gnc-tree-control-split-reg.c @@ -884,9 +884,9 @@ gnc_tree_control_split_reg_reinit (GncTreeViewSplitReg *view, gpointer data) } gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button(dialog, _("_Remove Splits"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run (GTK_DIALOG(dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) @@ -1021,9 +1021,9 @@ gnc_tree_control_split_reg_delete (GncTreeViewSplitReg *view, gpointer data) } gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button (dialog, _("_Delete Split"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run (GTK_DIALOG (dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) @@ -1061,9 +1061,9 @@ gnc_tree_control_split_reg_delete (GncTreeViewSplitReg *view, gpointer data) warning = GNC_PREF_WARN_REG_TRANS_DEL; } gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button (dialog, _("_Delete Transaction"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run (GTK_DIALOG (dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) diff --git a/src/gnome-utils/gnc-tree-view-split-reg.c b/src/gnome-utils/gnc-tree-view-split-reg.c index 9892247de2..b833372b0c 100644 --- a/src/gnome-utils/gnc-tree-view-split-reg.c +++ b/src/gnome-utils/gnc-tree-view-split-reg.c @@ -2451,7 +2451,7 @@ gtv_sr_transaction_changed_confirm (GncTreeViewSplitReg *view, "%s", message); gtk_dialog_add_buttons (GTK_DIALOG(dialog),_("_Discard Changes"), GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, _("_Record Changes"), GTK_RESPONSE_ACCEPT, NULL); response = gnc_dialog_run (GTK_DIALOG (dialog), GNC_PREF_WARN_REG_TRANS_MOD); diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c index 1a0e385a4a..cf022aa6f9 100644 --- a/src/gnome/dialog-commodities.c +++ b/src/gnome/dialog-commodities.c @@ -187,8 +187,8 @@ remove_clicked (CommoditiesDialog *cd) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_OK, (gchar *)NULL); response = gnc_dialog_run(GTK_DIALOG(dialog), warning); gtk_widget_destroy(dialog); diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c index c79504b10c..5314cb8bb5 100644 --- a/src/gnome/dialog-price-edit-db.c +++ b/src/gnome/dialog-price-edit-db.c @@ -195,8 +195,8 @@ gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data) "%s", message); g_free(message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_YES, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_YES, (gchar *)NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_PRICE_QUOTES_DEL); diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index e3bc4d5c10..b22bd16d68 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -1139,9 +1139,9 @@ identity_edit_clicked_cb (GtkButton *button, (GtkWindow *)ti_dialog->dialog, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_APPLY, + _("Apply"), GTK_RESPONSE_APPLY, NULL); diff --git a/src/gnome/gnc-plugin-budget.c b/src/gnome/gnc-plugin-budget.c index 049ee4aaca..9441e578c5 100644 --- a/src/gnome/gnc-plugin-budget.c +++ b/src/gnome/gnc-plugin-budget.c @@ -285,8 +285,8 @@ gnc_budget_gui_select_budget(QofBook *book) dlg = GTK_DIALOG(gtk_dialog_new_with_buttons( _("Select a Budget"), NULL, GTK_DIALOG_MODAL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL)); + _("OK"), GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, NULL)); tv = GTK_TREE_VIEW(gtk_tree_view_new()); sel = gtk_tree_view_get_selection(tv); diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index 35bf0c5083..3df50f1d65 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -1493,8 +1493,8 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag "%s", message); g_free(message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_ACCEPT, (gchar *)NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); response = gtk_dialog_run(GTK_DIALOG(dialog)); diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index fb84fb9bd8..dcb069a4a0 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -1569,11 +1569,11 @@ gnc_plugin_page_register_finish_pending (GncPluginPage *page) "Would you like to save the changes to this transaction, " "discard the transaction, or cancel the operation?")); gnc_gtk_dialog_add_button(dialog, _("_Discard Transaction"), - GTK_STOCK_DELETE, GTK_RESPONSE_REJECT); + _("Delete"), GTK_RESPONSE_REJECT); gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button(dialog, _("_Save Transaction"), - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT); + _("Save"), GTK_RESPONSE_ACCEPT); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); diff --git a/src/gnome/gnc-plugin-page-register2.c b/src/gnome/gnc-plugin-page-register2.c index 8e0de48182..e94898176f 100644 --- a/src/gnome/gnc-plugin-page-register2.c +++ b/src/gnome/gnc-plugin-page-register2.c @@ -1626,11 +1626,11 @@ gnc_plugin_page_register2_finish_pending (GncPluginPage *page) //this works "Would you like to save the changes to this transaction, " "discard the transaction, or cancel the operation?")); gnc_gtk_dialog_add_button (dialog, _("_Discard Transaction"), - GTK_STOCK_DELETE, GTK_RESPONSE_REJECT); + _("Delete"), GTK_RESPONSE_REJECT); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button (dialog, _("_Save Transaction"), - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT); + _("Save"), GTK_RESPONSE_ACCEPT); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index 43104f5473..411692f326 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -870,9 +870,9 @@ gsr_default_reinit_handler( GNCSplitReg *gsr, gpointer data ) } gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button(dialog, _("_Remove Splits"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run(GTK_DIALOG(dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) @@ -911,9 +911,9 @@ gsr_default_associate_handler_file (GNCSplitReg *gsr, Transaction *trans, gboole dialog = gtk_file_chooser_dialog_new (_("Associate File with Transaction"), GTK_WINDOW(gsr->window), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("Remove"), GTK_RESPONSE_REJECT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("OK"), GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(dialog), FALSE); @@ -982,9 +982,9 @@ gsr_default_associate_handler_location (GNCSplitReg *gsr, Transaction *trans, gb dialog = gtk_dialog_new_with_buttons (_("Associate Location with Transaction"), GTK_WINDOW(gsr->window), GTK_DIALOG_MODAL, - GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("Remove"), GTK_RESPONSE_REJECT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("OK"), GTK_RESPONSE_ACCEPT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); @@ -1251,9 +1251,9 @@ gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data ) } gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button(dialog, _("_Delete Split"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run(GTK_DIALOG(dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) @@ -1291,9 +1291,9 @@ gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data ) warning = GNC_PREF_WARN_REG_TRANS_DEL; } gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + _("Cancel"), GTK_RESPONSE_CANCEL); gnc_gtk_dialog_add_button(dialog, _("_Delete Transaction"), - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT); + _("Delete"), GTK_RESPONSE_ACCEPT); response = gnc_dialog_run(GTK_DIALOG(dialog), warning); gtk_widget_destroy (dialog); if (response != GTK_RESPONSE_ACCEPT) diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c index 89f07a61e8..58a56d7c1a 100644 --- a/src/import-export/csv-exp/assistant-csv-export.c +++ b/src/import-export/csv-exp/assistant-csv-export.c @@ -918,7 +918,7 @@ csv_export_assistant_create (CsvExportInfo *info) /* File chooser Page */ info->file_page = GTK_WIDGET(gtk_builder_get_object(builder, "file_page")); info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_SAVE); - button = gtk_button_new_from_stock (GTK_STOCK_OK); + button = gtk_button_new_with_label (_("OK")); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c index 0a0ee464bc..28f745f2ce 100644 --- a/src/import-export/csv-imp/assistant-csv-account-import.c +++ b/src/import-export/csv-imp/assistant-csv-account-import.c @@ -327,8 +327,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const /* Create the widgets */ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + _("OK"), GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_REJECT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG(dialog)); @@ -607,7 +607,7 @@ csv_import_assistant_create (CsvImportInfo *info) info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN); g_signal_connect (G_OBJECT(info->file_chooser), "file-activated", G_CALLBACK(csv_import_file_chooser_confirm_cb), info); - button = gtk_button_new_from_stock (GTK_STOCK_OK); + button = gtk_button_new_with_label (_("OK")); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); diff --git a/src/plugins/bi_import/dialog-bi-import-gui.c b/src/plugins/bi_import/dialog-bi-import-gui.c index d7fca752b5..07e2140609 100644 --- a/src/plugins/bi_import/dialog-bi-import-gui.c +++ b/src/plugins/bi_import/dialog-bi-import-gui.c @@ -401,8 +401,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const /* Create the widgets */ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + _("OK"), GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_REJECT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); @@ -459,7 +459,7 @@ gnc_info2_dialog (GtkWidget *parent, const gchar *title, const gchar *msg) /* Create the widgets */ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("OK"), GTK_RESPONSE_ACCEPT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/src/plugins/customer_import/dialog-customer-import-gui.c b/src/plugins/customer_import/dialog-customer-import-gui.c index 15d9ef34ea..d2e0fb7d95 100644 --- a/src/plugins/customer_import/dialog-customer-import-gui.c +++ b/src/plugins/customer_import/dialog-customer-import-gui.c @@ -376,8 +376,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const /* Create the widgets */ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + _("OK"), GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_REJECT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); @@ -433,7 +433,7 @@ gnc_info2_dialog (GtkWidget *parent, const gchar *title, const gchar *msg) /* Create the widgets */ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("OK"), GTK_RESPONSE_ACCEPT, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/src/register/ledger-core/split-register-control.c b/src/register/ledger-core/split-register-control.c index 493a67a041..a9efcddfe2 100644 --- a/src/register/ledger-core/split-register-control.c +++ b/src/register/ledger-core/split-register-control.c @@ -1551,7 +1551,7 @@ transaction_changed_confirm(VirtualLocation *p_new_virt_loc, "%s", message); gtk_dialog_add_buttons(GTK_DIALOG(dialog), _("_Discard Changes"), GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Cancel"), GTK_RESPONSE_CANCEL, _("_Record Changes"), GTK_RESPONSE_ACCEPT, NULL); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_REG_TRANS_MOD);