IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change dialog buttons from using GKT_STOCK_ labels

Browse Source 
Remove GTK_STOCK_... from dialog buttons as it is depreciated and
replace with text labels.
This commit is contained in:
Robert Fewell 2017-06-17 12:16:54 +01:00
parent ade9f71b9d
commit 08660a29ff
25 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/business/business-gnome/gnc-plugin-page-owner-tree.c
View File

@ -1076,8 +1076,8 @@ gnc_plugin_page_owner_tree_cmd_delete_owner (GtkAction *action, GncPluginPageOwn
"%s", message); "%s", message);
g_free(message); g_free(message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, _("Delete"), GTK_RESPONSE_ACCEPT,
(gchar *)NULL); (gchar *)NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
response = gtk_dialog_run(GTK_DIALOG(dialog)); response = gtk_dialog_run(GTK_DIALOG(dialog));

2
src/business/business-ledger/gncEntryLedger.c
View File

@ -915,7 +915,7 @@ gnc_entry_ledger_duplicate_current_entry (GncEntryLedger *ledger)
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", message); "%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
_("_Record"), GTK_RESPONSE_ACCEPT, _("_Record"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_DUP); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_DUP);

2
src/business/business-ledger/gncEntryLedgerControl.c
View File

@ -896,7 +896,7 @@ static gboolean gnc_entry_ledger_traverse (VirtualLocation *p_new_virt_loc,
"%s", message); "%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
_("_Don't Record"), GTK_RESPONSE_REJECT, _("_Don't Record"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
_("_Record"), GTK_RESPONSE_ACCEPT, _("_Record"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_MOD); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_MOD);

4
src/gnome-search/dialog-search.c
View File

@ -723,7 +723,7 @@ attach_element (GtkWidget *element, GNCSearchWindow *sw, int row)
GTK_EXPAND | GTK_FILL, 0, 0, 0); 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_object_set_data (G_OBJECT (remove), "element", element);
g_signal_connect (G_OBJECT (remove), "clicked", G_CALLBACK (remove_element), sw); 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, 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); gtk_label_set_text (GTK_LABEL (label), type_label);
/* Set the 'add criterion' button */ /* 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); g_signal_connect (G_OBJECT (add), "clicked", G_CALLBACK (add_criterion), sw);
box = GTK_WIDGET(gtk_builder_get_object (builder, "add_button_box")); box = GTK_WIDGET(gtk_builder_get_object (builder, "add_button_box"));

4
src/gnome-search/search-account.c
View File

@ -258,8 +258,8 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi)
GTK_DIALOG(gtk_dialog_new_with_buttons(_("Select the Accounts to Compare"), GTK_DIALOG(gtk_dialog_new_with_buttons(_("Select the Accounts to Compare"),
NULL, NULL,
0, 0,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, _("OK"), GTK_RESPONSE_OK,
NULL)); NULL));
/* Put the dialog together */ /* Put the dialog together */

4
src/gnome-utils/dialog-account.c
View File

@ -643,8 +643,8 @@ verify_children_compatible (AccountWindow *aw)
GTK_WINDOW(aw->dialog), GTK_WINDOW(aw->dialog),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_DESTROY_WITH_PARENT |
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, _("OK"), GTK_RESPONSE_OK,
NULL); NULL);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);

26
src/gnome-utils/gnc-file.c
View File

@ -84,7 +84,7 @@ gnc_file_dialog (const char * title,
GtkWidget *file_box; GtkWidget *file_box;
const char *internal_name; const char *internal_name;
char *file_name = NULL; char *file_name = NULL;
gchar * okbutton = GTK_STOCK_OPEN; gchar * okbutton = _("Open");
const gchar *ok_icon = NULL; const gchar *ok_icon = NULL;
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN; GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
gint response; gint response;
@ -95,7 +95,7 @@ gnc_file_dialog (const char * title,
{ {
case GNC_FILE_DIALOG_OPEN: case GNC_FILE_DIALOG_OPEN:
action = GTK_FILE_CHOOSER_ACTION_OPEN; action = GTK_FILE_CHOOSER_ACTION_OPEN;
okbutton = GTK_STOCK_OPEN; okbutton = _("Open");
if (title == NULL) if (title == NULL)
title = _("Open"); title = _("Open");
break; break;
@ -107,7 +107,7 @@ gnc_file_dialog (const char * title,
break; break;
case GNC_FILE_DIALOG_SAVE: case GNC_FILE_DIALOG_SAVE:
action = GTK_FILE_CHOOSER_ACTION_SAVE; action = GTK_FILE_CHOOSER_ACTION_SAVE;
okbutton = GTK_STOCK_SAVE; okbutton = _("Save");
if (title == NULL) if (title == NULL)
title = _("Save"); title = _("Save");
break; break;
@ -125,7 +125,7 @@ gnc_file_dialog (const char * title,
title, title,
NULL, NULL,
action, action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
NULL); NULL);
if (ok_icon) if (ok_icon)
gnc_gtk_dialog_add_button(file_box, okbutton, ok_icon, GTK_RESPONSE_ACCEPT); 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: case GNC_FILE_DIALOG_OPEN:
default: default:
label = GTK_STOCK_OPEN; label = _("Open");
fmt = _("GnuCash could not obtain the lock for %s. " fmt = _("GnuCash could not obtain the lock for %s. "
"That database may be in use by another user, " "That database may be in use by another user, "
"in which case you should not open the database. " "in which case you should not open the database. "
@ -286,7 +286,7 @@ show_session_error (QofBackendError io_error,
break; break;
case GNC_FILE_DIALOG_SAVE: case GNC_FILE_DIALOG_SAVE:
label = GTK_STOCK_SAVE; label = _("Save");
fmt = _("GnuCash could not obtain the lock for %s. " fmt = _("GnuCash could not obtain the lock for %s. "
"That database may be in use by another user, " "That database may be in use by another user, "
"in which case you should not save the database. " "in which case you should not save the database. "
@ -309,7 +309,7 @@ show_session_error (QofBackendError io_error,
fmt, fmt,
displayname); displayname);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
label, GTK_RESPONSE_YES, label, GTK_RESPONSE_YES,
NULL); NULL);
if (parent == NULL) if (parent == NULL)
@ -607,9 +607,9 @@ gnc_file_query_save (gboolean can_cancel)
if (can_cancel) if (can_cancel)
gtk_dialog_add_button(GTK_DIALOG(dialog), 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_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); 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); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"), 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"), 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"), gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"),
GTK_STOCK_OPEN, RESPONSE_OPEN); _("Open"), RESPONSE_OPEN);
if (shutdown_cb) if (shutdown_cb)
gtk_dialog_add_button(GTK_DIALOG(dialog), gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_QUIT, RESPONSE_QUIT); _("Quit"), RESPONSE_QUIT);
rc = gtk_dialog_run(GTK_DIALOG(dialog)); rc = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
g_free (displayname); g_free (displayname);

4
src/gnome-utils/gnc-gui-query.c
View File

@ -342,10 +342,10 @@ gnc_choose_radio_option_dialog(GtkWidget *parent,
} }
if (!button_name) if (!button_name)
button_name = GTK_STOCK_OK; button_name = _("OK");
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
button_name, GTK_RESPONSE_OK, button_name, GTK_RESPONSE_OK,
NULL); NULL);

4
src/gnome-utils/gnc-main-window.c
View File

@ -1256,8 +1256,8 @@ gnc_main_window_prompt_for_save (GtkWidget *window)
} }
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
_("Close _Without Saving"), GTK_RESPONSE_CLOSE, _("Close _Without Saving"), GTK_RESPONSE_CLOSE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, _("Save"), GTK_RESPONSE_APPLY,
NULL); NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_APPLY); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_APPLY);

8
src/gnome-utils/gnc-recurrence.c
View File

@ -23,9 +23,11 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
*******************************************************************/ *******************************************************************/
#include "config.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "config.h" #include <glib/gi18n.h>
#include "dialog-utils.h" #include "dialog-utils.h"
#include "gnc-recurrence.h" #include "gnc-recurrence.h"
#include "gnc-date-edit.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); gtk_box_set_homogeneous (GTK_BOX (grc->vbox), FALSE);
grc->rlist = NULL; 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_signal_connect(G_OBJECT(grc->buttAdd), "clicked",
G_CALLBACK(addClicked), grc); 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_signal_connect(G_OBJECT(grc->buttRemove), "clicked",
G_CALLBACK(removeClicked), grc); G_CALLBACK(removeClicked), grc);

12
src/gnome-utils/gnc-tree-control-split-reg.c
View File

@ -884,9 +884,9 @@ gnc_tree_control_split_reg_reinit (GncTreeViewSplitReg *view, gpointer data)
} }
gtk_dialog_add_button (GTK_DIALOG (dialog), 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"), 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); response = gnc_dialog_run (GTK_DIALOG(dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) 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_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); _("Cancel"), GTK_RESPONSE_CANCEL);
gnc_gtk_dialog_add_button (dialog, _("_Delete Split"), 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); response = gnc_dialog_run (GTK_DIALOG (dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) 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; warning = GNC_PREF_WARN_REG_TRANS_DEL;
} }
gtk_dialog_add_button (GTK_DIALOG (dialog), 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"), 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); response = gnc_dialog_run (GTK_DIALOG (dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) if (response != GTK_RESPONSE_ACCEPT)

2
src/gnome-utils/gnc-tree-view-split-reg.c
View File

@ -2451,7 +2451,7 @@ gtv_sr_transaction_changed_confirm (GncTreeViewSplitReg *view,
"%s", message); "%s", message);
gtk_dialog_add_buttons (GTK_DIALOG(dialog),_("_Discard Changes"), GTK_RESPONSE_REJECT, 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); _("_Record Changes"), GTK_RESPONSE_ACCEPT, NULL);
response = gnc_dialog_run (GTK_DIALOG (dialog), GNC_PREF_WARN_REG_TRANS_MOD); response = gnc_dialog_run (GTK_DIALOG (dialog), GNC_PREF_WARN_REG_TRANS_MOD);

4
src/gnome/dialog-commodities.c
View File

@ -187,8 +187,8 @@ remove_clicked (CommoditiesDialog *cd)
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", message); "%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_DELETE, GTK_RESPONSE_OK, _("Delete"), GTK_RESPONSE_OK,
(gchar *)NULL); (gchar *)NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), warning); response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);

4
src/gnome/dialog-price-edit-db.c
View File

@ -195,8 +195,8 @@ gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data)
"%s", message); "%s", message);
g_free(message); g_free(message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_DELETE, GTK_RESPONSE_YES, _("Delete"), GTK_RESPONSE_YES,
(gchar *)NULL); (gchar *)NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_PRICE_QUOTES_DEL); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_PRICE_QUOTES_DEL);

4
src/gnome/dialog-tax-info.c
View File

@ -1139,9 +1139,9 @@ identity_edit_clicked_cb (GtkButton *button,
(GtkWindow *)ti_dialog->dialog, (GtkWindow *)ti_dialog->dialog,
GTK_DIALOG_MODAL | GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, _("Cancel"),
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY, _("Apply"),
GTK_RESPONSE_APPLY, GTK_RESPONSE_APPLY,
NULL); NULL);

4
src/gnome/gnc-plugin-budget.c
View File

@ -285,8 +285,8 @@ gnc_budget_gui_select_budget(QofBook *book)
dlg = GTK_DIALOG(gtk_dialog_new_with_buttons( dlg = GTK_DIALOG(gtk_dialog_new_with_buttons(
_("Select a Budget"), NULL, GTK_DIALOG_MODAL, _("Select a Budget"), NULL, GTK_DIALOG_MODAL,
GTK_STOCK_OK, GTK_RESPONSE_OK, _("OK"), GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL)); _("Cancel"), GTK_RESPONSE_CANCEL, NULL));
tv = GTK_TREE_VIEW(gtk_tree_view_new()); tv = GTK_TREE_VIEW(gtk_tree_view_new());
sel = gtk_tree_view_get_selection(tv); sel = gtk_tree_view_get_selection(tv);

4
src/gnome/gnc-plugin-page-account-tree.c
View File

@ -1493,8 +1493,8 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag
"%s", message); "%s", message);
g_free(message); g_free(message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, _("Delete"), GTK_RESPONSE_ACCEPT,
(gchar *)NULL); (gchar *)NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
response = gtk_dialog_run(GTK_DIALOG(dialog)); response = gtk_dialog_run(GTK_DIALOG(dialog));

6
src/gnome/gnc-plugin-page-register.c
View File

@ -1569,11 +1569,11 @@ gnc_plugin_page_register_finish_pending (GncPluginPage *page)
"Would you like to save the changes to this transaction, " "Would you like to save the changes to this transaction, "
"discard the transaction, or cancel the operation?")); "discard the transaction, or cancel the operation?"));
gnc_gtk_dialog_add_button(dialog, _("_Discard Transaction"), 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_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); _("Cancel"), GTK_RESPONSE_CANCEL);
gnc_gtk_dialog_add_button(dialog, _("_Save Transaction"), 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)); response = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);

6
src/gnome/gnc-plugin-page-register2.c
View File

@ -1626,11 +1626,11 @@ gnc_plugin_page_register2_finish_pending (GncPluginPage *page) //this works
"Would you like to save the changes to this transaction, " "Would you like to save the changes to this transaction, "
"discard the transaction, or cancel the operation?")); "discard the transaction, or cancel the operation?"));
gnc_gtk_dialog_add_button (dialog, _("_Discard Transaction"), 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_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); _("Cancel"), GTK_RESPONSE_CANCEL);
gnc_gtk_dialog_add_button (dialog, _("_Save Transaction"), 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)); response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);

24
src/gnome/gnc-split-reg.c
View File

@ -870,9 +870,9 @@ gsr_default_reinit_handler( GNCSplitReg *gsr, gpointer data )
} }
gtk_dialog_add_button(GTK_DIALOG(dialog), 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"), 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); response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) 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"), dialog = gtk_file_chooser_dialog_new (_("Associate File with Transaction"),
GTK_WINDOW(gsr->window), GTK_WINDOW(gsr->window),
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT, _("Remove"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(dialog), FALSE); 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"), dialog = gtk_dialog_new_with_buttons (_("Associate Location with Transaction"),
GTK_WINDOW(gsr->window), GTK_WINDOW(gsr->window),
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT, _("Remove"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); _("Cancel"), GTK_RESPONSE_CANCEL);
gnc_gtk_dialog_add_button(dialog, _("_Delete Split"), 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); response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) if (response != GTK_RESPONSE_ACCEPT)
@ -1291,9 +1291,9 @@ gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data )
warning = GNC_PREF_WARN_REG_TRANS_DEL; warning = GNC_PREF_WARN_REG_TRANS_DEL;
} }
gtk_dialog_add_button(GTK_DIALOG(dialog), 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"), 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); response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
if (response != GTK_RESPONSE_ACCEPT) if (response != GTK_RESPONSE_ACCEPT)

2
src/import-export/csv-exp/assistant-csv-export.c
View File

@ -918,7 +918,7 @@ csv_export_assistant_create (CsvExportInfo *info)
/* File chooser Page */ /* File chooser Page */
info->file_page = GTK_WIDGET(gtk_builder_get_object(builder, "file_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); 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_set_size_request (button, 100, -1);
gtk_widget_show (button); gtk_widget_show (button);
h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

6
src/import-export/csv-imp/assistant-csv-account-import.c
View File

@ -327,8 +327,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const
/* Create the widgets */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, _("Cancel"), GTK_RESPONSE_REJECT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG(dialog)); 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); info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
g_signal_connect (G_OBJECT(info->file_chooser), "file-activated", g_signal_connect (G_OBJECT(info->file_chooser), "file-activated",
G_CALLBACK(csv_import_file_chooser_confirm_cb), info); 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_set_size_request (button, 100, -1);
gtk_widget_show (button); gtk_widget_show (button);
h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

6
src/plugins/bi_import/dialog-bi-import-gui.c
View File

@ -401,8 +401,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const
/* Create the widgets */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, _("Cancel"), GTK_RESPONSE_REJECT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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 */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

6
src/plugins/customer_import/dialog-customer-import-gui.c
View File

@ -376,8 +376,8 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const
/* Create the widgets */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, _("Cancel"), GTK_RESPONSE_REJECT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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 */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent), dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, _("OK"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

2
src/register/ledger-core/split-register-control.c
View File

@ -1551,7 +1551,7 @@ transaction_changed_confirm(VirtualLocation *p_new_virt_loc,
"%s", message); "%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), gtk_dialog_add_buttons(GTK_DIALOG(dialog),
_("_Discard Changes"), GTK_RESPONSE_REJECT, _("_Discard Changes"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("Cancel"), GTK_RESPONSE_CANCEL,
_("_Record Changes"), GTK_RESPONSE_ACCEPT, _("_Record Changes"), GTK_RESPONSE_ACCEPT,
NULL); NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_REG_TRANS_MOD); response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_REG_TRANS_MOD);