From 34d1d840e0ff21d9ab7f3fecc95cd60bc63224a8 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Mon, 26 Jun 2017 15:58:59 +0100 Subject: [PATCH] Replace GTK_STOCK_... images with there equivalent icon name --- .../business-gnome/gnc-plugin-page-invoice.c | 20 ++--- .../gtkbuilder/dialog-date-close.glade | 4 +- .../gtkbuilder/dialog-invoice.glade | 2 +- .../gtkbuilder/dialog-payment.glade | 2 +- src/gnome-utils/dialog-account.c | 2 +- src/gnome-utils/gnc-main-window.c | 28 +++---- src/gnome-utils/gnc-tree-view.c | 2 +- .../gtkbuilder/assistant-xml-encoding.glade | 9 ++- .../gtkbuilder/dialog-preferences.glade | 74 +++++++++++-------- src/gnome/dialog-find-account.c | 16 ++-- src/gnome/dialog-print-check.c | 2 +- src/gnome/gnc-plugin-basic-commands.c | 12 +-- src/gnome/gnc-plugin-page-account-tree.c | 4 +- src/gnome/gnc-plugin-page-budget.c | 4 +- src/gnome/gnc-plugin-page-register.c | 28 +++---- src/gnome/gnc-plugin-page-register2.c | 34 ++++----- src/gnome/gtkbuilder/dialog-new-user.glade | 4 +- src/gnome/window-reconcile.c | 12 +-- src/gnome/window-reconcile2.c | 12 +-- .../csv-imp/assistant-csv-trans-import.cpp | 10 +-- .../csv-imp/assistant-csv-trans-import.glade | 8 +- 21 files changed, 152 insertions(+), 137 deletions(-) diff --git a/src/business/business-gnome/gnc-plugin-page-invoice.c b/src/business/business-gnome/gnc-plugin-page-invoice.c index 121a8b173c..8e30b367c8 100644 --- a/src/business/business-gnome/gnc-plugin-page-invoice.c +++ b/src/business/business-gnome/gnc-plugin-page-invoice.c @@ -104,24 +104,24 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = G_CALLBACK (gnc_plugin_page_invoice_cmd_new_account) }, { - "FilePrintAction", GTK_STOCK_PRINT, N_("Print Invoice"), "p", + "FilePrintAction", "document-print", N_("Print Invoice"), "p", N_("Make a printable invoice"), G_CALLBACK (gnc_plugin_page_invoice_cmd_print) }, /* Edit menu */ { - "EditCutAction", GTK_STOCK_CUT, N_("_Cut"), NULL, + "EditCutAction", "edit-cut", N_("_Cut"), NULL, NULL, G_CALLBACK (gnc_plugin_page_invoice_cmd_cut) }, { - "EditCopyAction", GTK_STOCK_COPY, N_("Copy"), NULL, + "EditCopyAction", "edit-copy", N_("Copy"), NULL, NULL, G_CALLBACK (gnc_plugin_page_invoice_cmd_copy) }, { - "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL, + "EditPasteAction", "edit-paste", N_("_Paste"), NULL, NULL, G_CALLBACK (gnc_plugin_page_invoice_cmd_paste) }, @@ -148,7 +148,7 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = /* Actions menu */ { - "RecordEntryAction", GTK_STOCK_ADD, N_("_Enter"), NULL, + "RecordEntryAction", "list-add", N_("_Enter"), NULL, N_("Record the current entry"), G_CALLBACK (gnc_plugin_page_invoice_cmd_enter) }, @@ -158,27 +158,27 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = G_CALLBACK (gnc_plugin_page_invoice_cmd_cancel) }, { - "DeleteEntryAction", GTK_STOCK_DELETE, N_("_Delete"), NULL, + "DeleteEntryAction", "edit-delete", N_("_Delete"), NULL, N_("Delete the current entry"), G_CALLBACK (gnc_plugin_page_invoice_cmd_delete) }, { - "BlankEntryAction", GTK_STOCK_GOTO_BOTTOM, N_("_Blank"), NULL, + "BlankEntryAction", "go-bottom", N_("_Blank"), NULL, N_("Move to the blank entry at the bottom of the Invoice"), G_CALLBACK (gnc_plugin_page_invoice_cmd_blank) }, { - "DuplicateEntryAction", GTK_STOCK_COPY, N_("Dup_licate Entry"), NULL, + "DuplicateEntryAction", "edit-copy", N_("Dup_licate Entry"), NULL, N_("Make a copy of the current entry"), G_CALLBACK (gnc_plugin_page_invoice_cmd_duplicateEntry) }, { - "EntryUpAction", GTK_STOCK_GO_UP, N_("Move Entry _Up"), NULL, + "EntryUpAction", "go-up", N_("Move Entry _Up"), NULL, N_("Move the current entry one row upwards"), G_CALLBACK (gnc_plugin_page_invoice_cmd_entryUp) }, { - "EntryDownAction", GTK_STOCK_GO_DOWN, N_("Move Entry Do_wn"), NULL, + "EntryDownAction", "go-down", N_("Move Entry Do_wn"), NULL, N_("Move the current entry one row downwards"), G_CALLBACK (gnc_plugin_page_invoice_cmd_entryDown) }, diff --git a/src/business/business-gnome/gtkbuilder/dialog-date-close.glade b/src/business/business-gnome/gtkbuilder/dialog-date-close.glade index 169b0731e2..64d2bb48a9 100644 --- a/src/business/business-gnome/gtkbuilder/dialog-date-close.glade +++ b/src/business/business-gnome/gtkbuilder/dialog-date-close.glade @@ -73,7 +73,7 @@ True False - gtk-dialog-question + dialog-question False @@ -389,7 +389,7 @@ True False - gtk-dialog-question + dialog-question False diff --git a/src/business/business-gnome/gtkbuilder/dialog-invoice.glade b/src/business/business-gnome/gtkbuilder/dialog-invoice.glade index cccdde6073..1d998e5bc2 100644 --- a/src/business/business-gnome/gtkbuilder/dialog-invoice.glade +++ b/src/business/business-gnome/gtkbuilder/dialog-invoice.glade @@ -1343,7 +1343,7 @@ True False - gtk-dialog-question + dialog-question False diff --git a/src/business/business-gnome/gtkbuilder/dialog-payment.glade b/src/business/business-gnome/gtkbuilder/dialog-payment.glade index 196683b065..d6e5059473 100644 --- a/src/business/business-gnome/gtkbuilder/dialog-payment.glade +++ b/src/business/business-gnome/gtkbuilder/dialog-payment.glade @@ -87,7 +87,7 @@ False - gtk-dialog-warning + dialog-warning False diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 2468b03e3d..34dc8fd82d 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -656,7 +656,7 @@ verify_children_compatible (AccountWindow *aw) gtk_box_pack_start ( GTK_BOX (hbox), - gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG), + gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0); /* primary label */ diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index d9246462b0..4304b55660 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -273,29 +273,29 @@ static GtkActionEntry gnc_menu_actions [] = { "FileImportAction", NULL, N_("_Import"), NULL, NULL, NULL }, { "FileExportAction", NULL, N_("_Export"), NULL, NULL, NULL }, { - "FilePrintAction", GTK_STOCK_PRINT, N_("_Print..."), "p", + "FilePrintAction", "document-print", N_("_Print..."), "p", N_("Print the currently active page"), NULL }, #ifndef GTK_STOCK_PAGE_SETUP # define GTK_STOCK_PAGE_SETUP NULL #endif { - "FilePageSetupAction", GTK_STOCK_PAGE_SETUP, N_("Pa_ge Setup..."), "p", + "FilePageSetupAction", "document-page-setup", N_("Pa_ge Setup..."), "p", N_("Specify the page size and orientation for printing"), G_CALLBACK (gnc_main_window_cmd_page_setup) }, { - "FilePropertiesAction", GTK_STOCK_PROPERTIES, N_("Proper_ties"), "Return", + "FilePropertiesAction", "document-properties", N_("Proper_ties"), "Return", N_("Edit the properties of the current file"), G_CALLBACK (gnc_main_window_cmd_file_properties) }, { - "FileCloseAction", GTK_STOCK_CLOSE, N_("_Close"), NULL, + "FileCloseAction", "window-close", N_("_Close"), NULL, N_("Close the currently active page"), G_CALLBACK (gnc_main_window_cmd_file_close) }, { - "FileQuitAction", GTK_STOCK_QUIT, N_("_Quit"), NULL, + "FileQuitAction", "application-exit", N_("_Quit"), NULL, N_("Quit this application"), G_CALLBACK (gnc_main_window_cmd_file_quit) }, @@ -303,22 +303,22 @@ static GtkActionEntry gnc_menu_actions [] = /* Edit menu */ { - "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), NULL, + "EditCutAction", "edit-cut", N_("Cu_t"), NULL, N_("Cut the current selection and copy it to clipboard"), G_CALLBACK (gnc_main_window_cmd_edit_cut) }, { - "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), NULL, + "EditCopyAction", "edit-copy", N_("_Copy"), NULL, N_("Copy the current selection to clipboard"), G_CALLBACK (gnc_main_window_cmd_edit_copy) }, { - "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL, + "EditPasteAction", "edit-paste", N_("_Paste"), NULL, N_("Paste the clipboard content at the cursor position"), G_CALLBACK (gnc_main_window_cmd_edit_paste) }, { - "EditPreferencesAction", GTK_STOCK_PREFERENCES, N_("Pr_eferences"), NULL, + "EditPreferencesAction", "preferences-system", N_("Pr_eferences"), NULL, N_("Edit the global preferences of GnuCash"), G_CALLBACK (gnc_main_window_cmd_edit_preferences) }, @@ -334,7 +334,7 @@ static GtkActionEntry gnc_menu_actions [] = N_("Select the account types that should be displayed."), NULL }, { - "ViewRefreshAction", GTK_STOCK_REFRESH, N_("_Refresh"), "r", + "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", N_("Refresh this window"), G_CALLBACK (gnc_main_window_cmd_view_refresh) }, @@ -369,17 +369,17 @@ static GtkActionEntry gnc_menu_actions [] = /* Help menu */ { - "HelpTutorialAction", GTK_STOCK_HELP, N_("Tutorial and Concepts _Guide"), NULL, + "HelpTutorialAction", "help-browser", N_("Tutorial and Concepts _Guide"), NULL, N_("Open the GnuCash Tutorial"), G_CALLBACK (gnc_main_window_cmd_help_tutorial) }, { - "HelpContentsAction", GTK_STOCK_HELP, N_("_Contents"), "F1", + "HelpContentsAction", "help-browser", N_("_Contents"), "F1", N_("Open the GnuCash Help"), G_CALLBACK (gnc_main_window_cmd_help_contents) }, { - "HelpAboutAction", GTK_STOCK_ABOUT, N_("_About"), NULL, + "HelpAboutAction", "help-about", N_("_About"), NULL, N_("About GnuCash"), G_CALLBACK (gnc_main_window_cmd_help_about) }, @@ -2973,7 +2973,7 @@ gnc_main_window_open_page (GncMainWindow *window, close_button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE); - close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + close_image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_widget_show(close_image); gtk_widget_get_preferred_size (close_image, &requisition, NULL); gtk_widget_set_size_request(close_button, requisition.width + 4, diff --git a/src/gnome-utils/gnc-tree-view.c b/src/gnome-utils/gnc-tree-view.c index fff90b34ce..d69687cf30 100644 --- a/src/gnome-utils/gnc-tree-view.c +++ b/src/gnome-utils/gnc-tree-view.c @@ -269,7 +269,7 @@ gnc_tree_view_init (GncTreeView *view, GncTreeViewClass *klass) /* Create the last column which contains the column selection * widget. gnc_tree_view_add_text_column will do most of the * work. */ - icon = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, + icon = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_show(icon); gtk_widget_get_preferred_size(icon, &requisition, NULL); diff --git a/src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade b/src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade index 14203c7cf7..49dbb87038 100644 --- a/src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade +++ b/src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade @@ -170,6 +170,9 @@ False + + False + @@ -309,7 +312,7 @@ True False - gtk-go-forward + go-next @@ -392,7 +395,7 @@ True False - gtk-go-forward + go-next @@ -471,7 +474,7 @@ True False - gtk-go-back + go-previous diff --git a/src/gnome-utils/gtkbuilder/dialog-preferences.glade b/src/gnome-utils/gtkbuilder/dialog-preferences.glade index 8c0481bfb8..7079e1270c 100644 --- a/src/gnome-utils/gtkbuilder/dialog-preferences.glade +++ b/src/gnome-utils/gtkbuilder/dialog-preferences.glade @@ -625,25 +625,6 @@ 14 - - - True - True - GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK - True - The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: &quot;colon&quot; &quot;slash&quot;, &quot;backslash&quot;, &quot;dash&quot; and &quot;period&quot;. - The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: "colon" "slash", "backslash", "dash" and "period". - ● - False - False - - - - - 1 - 1 - - True @@ -694,17 +675,6 @@ 14 - - - False - start - gtk-dialog-warning - - - 1 - 1 - - True @@ -792,6 +762,48 @@ 13 + + + True + False + + + False + start + dialog-warning + + + False + True + 0 + + + + + True + True + GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK + True + The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: &quot;colon&quot; &quot;slash&quot;, &quot;backslash&quot;, &quot;dash&quot; and &quot;period&quot;. + The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: "colon" "slash", "backslash", "dash" and "period". + ● + False + False + + + + + True + True + 1 + + + + + 1 + 1 + + @@ -1693,7 +1705,7 @@ many months before the current month: True False 12 - gtk-dialog-warning + dialog-warning False diff --git a/src/gnome/dialog-find-account.c b/src/gnome/dialog-find-account.c index c7212ebdc7..1e3217a6ef 100644 --- a/src/gnome/dialog-find-account.c +++ b/src/gnome/dialog-find-account.c @@ -187,10 +187,10 @@ fill_model (FindAccountDialog *facc_dialog, Account *account) gtk_list_store_set (GTK_LIST_STORE(model), &iter, ACC_FULL_NAME, fullname, ACCOUNT, account, - PLACE_HOLDER, (xaccAccountGetPlaceholder (account) == TRUE ? GTK_STOCK_YES : NULL), - HIDDEN, (xaccAccountGetHidden (account) == TRUE ? GTK_STOCK_YES : NULL), - NOT_USED, (splits == 0 ? GTK_STOCK_YES : NULL), - BAL_ZERO, (gnc_numeric_zero_p (total) == TRUE ? GTK_STOCK_YES : NULL), -1); + PLACE_HOLDER, (xaccAccountGetPlaceholder (account) == TRUE ? "emblem-default" : NULL), + HIDDEN, (xaccAccountGetHidden (account) == TRUE ? "emblem-default" : NULL), + NOT_USED, (splits == 0 ? "emblem-default" : NULL), + BAL_ZERO, (gnc_numeric_zero_p (total) == TRUE ? "emblem-default" : NULL), -1); g_free (fullname); } @@ -316,7 +316,7 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo cr = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (tree_column, cr, TRUE); // connect 'active' and set 'xalign' property of the cell renderer - gtk_tree_view_column_set_attributes (tree_column, cr, "stock-id", PLACE_HOLDER, NULL); + gtk_tree_view_column_set_attributes (tree_column, cr, "icon-name", PLACE_HOLDER, NULL); gtk_cell_renderer_set_alignment (cr, 0.5, 0.5); tree_column = gtk_tree_view_column_new(); @@ -327,7 +327,7 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo cr = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (tree_column, cr, TRUE); // connect 'active' and set 'xalign' property of the cell renderer - gtk_tree_view_column_set_attributes (tree_column, cr, "stock-id", HIDDEN, NULL); + gtk_tree_view_column_set_attributes (tree_column, cr, "icon-name", HIDDEN, NULL); gtk_cell_renderer_set_alignment (cr, 0.5, 0.5); tree_column = gtk_tree_view_column_new(); @@ -338,7 +338,7 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo cr = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (tree_column, cr, TRUE); // connect 'active' and set 'xalign' property of the cell renderer - gtk_tree_view_column_set_attributes (tree_column, cr, "stock-id", NOT_USED, NULL); + gtk_tree_view_column_set_attributes (tree_column, cr, "icon-name", NOT_USED, NULL); gtk_cell_renderer_set_alignment (cr, 0.5, 0.5); tree_column = gtk_tree_view_column_new(); @@ -349,7 +349,7 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo cr = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (tree_column, cr, TRUE); // connect 'active' and set 'xalign' property of the cell renderer - gtk_tree_view_column_set_attributes (tree_column, cr, "stock-id", BAL_ZERO, NULL); + gtk_tree_view_column_set_attributes (tree_column, cr, "icon-name", BAL_ZERO, NULL); gtk_cell_renderer_set_alignment (cr, 0.5, 0.5); gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, facc_dialog); diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 434aadc9af..b2c64d671b 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -1937,7 +1937,7 @@ draw_picture(GtkPrintContext *context, check_item_t *data) g_warning("Filename '%s' cannot be read or understood.", data->filename); pixbuf = gtk_widget_render_icon_pixbuf (GTK_WIDGET(image), - GTK_STOCK_MISSING_IMAGE, -1); + "image-missing", -1); } pix_w = gdk_pixbuf_get_width(pixbuf); pix_h = gdk_pixbuf_get_height(pixbuf); diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c index 395e68ae3f..0dc69e4582 100644 --- a/src/gnome/gnc-plugin-basic-commands.c +++ b/src/gnome/gnc-plugin-basic-commands.c @@ -108,27 +108,27 @@ static GtkActionEntry gnc_plugin_actions [] = /* File menu */ { - "FileNewAction", GTK_STOCK_NEW, N_("New _File"), "n", + "FileNewAction", "document-new", N_("New _File"), "n", N_("Create a new file"), G_CALLBACK (gnc_main_window_cmd_file_new) }, { - "FileOpenAction", GTK_STOCK_OPEN, N_("_Open..."), "o", + "FileOpenAction", "document-open", N_("_Open..."), "o", N_("Open an existing GnuCash file"), G_CALLBACK (gnc_main_window_cmd_file_open) }, { - "FileSaveAction", GTK_STOCK_SAVE, N_("_Save"), "s", + "FileSaveAction", "document-save", N_("_Save"), "s", N_("Save the current file"), G_CALLBACK (gnc_main_window_cmd_file_save) }, { - "FileSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save _As..."), "s", + "FileSaveAsAction", "document-save-as", N_("Save _As..."), "s", N_("Save this file with a different name"), G_CALLBACK (gnc_main_window_cmd_file_save_as) }, { - "FileRevertAction", GTK_STOCK_REVERT_TO_SAVED, N_("Re_vert"), NULL, + "FileRevertAction", "document-revert", N_("Re_vert"), NULL, N_("Reload the current database, reverting all unsaved changes"), G_CALLBACK (gnc_main_window_cmd_file_revert) }, @@ -142,7 +142,7 @@ static GtkActionEntry gnc_plugin_actions [] = /* Edit menu */ { - "EditFindTransactionsAction", GTK_STOCK_FIND, N_("_Find..."), "f", + "EditFindTransactionsAction", "edit-find", N_("_Find..."), "f", N_("Find transactions with a search"), G_CALLBACK (gnc_main_window_cmd_tools_find_transactions) }, diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index 4e07a0af17..72de2c6966 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -225,12 +225,12 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = G_CALLBACK (gnc_plugin_page_account_tree_cmd_delete_account) }, { - "EditFindAccountAction", GTK_STOCK_FIND, N_("F_ind Account"), "i", + "EditFindAccountAction", "edit-find", N_("F_ind Account"), "i", N_("Find an account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_find_account) }, { - "EditFindAccountPopupAction", GTK_STOCK_FIND, N_("F_ind Account"), "i", + "EditFindAccountPopupAction", "edit-find", N_("F_ind Account"), "i", N_("Find an account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_find_account_popup) }, diff --git a/src/gnome/gnc-plugin-page-budget.c b/src/gnome/gnc-plugin-page-budget.c index 788956c554..d2854d012d 100644 --- a/src/gnome/gnc-plugin-page-budget.c +++ b/src/gnome/gnc-plugin-page-budget.c @@ -141,12 +141,12 @@ static GtkActionEntry gnc_plugin_page_budget_actions [] = G_CALLBACK (gnc_plugin_page_budget_cmd_delete_budget) }, { - "OptionsBudgetAction", GTK_STOCK_PROPERTIES, N_("Budget Options"), + "OptionsBudgetAction", "document-properties", N_("Budget Options"), NULL, N_("Edit this budget's options"), G_CALLBACK (gnc_plugin_page_budget_cmd_view_options) }, { - "EstimateBudgetAction", GTK_STOCK_EXECUTE, N_("Estimate Budget"), + "EstimateBudgetAction", "system-run", N_("Estimate Budget"), NULL, N_("Estimate a budget value for the selected accounts from past transactions"), G_CALLBACK (gnc_plugin_page_budget_cmd_estimate_budget) diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index 7f674115e9..212b63313d 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -225,24 +225,24 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = /* File menu */ { - "FilePrintAction", GTK_STOCK_PRINT, N_("_Print Checks..."), "p", NULL, + "FilePrintAction", "document-print", N_("_Print Checks..."), "p", NULL, G_CALLBACK (gnc_plugin_page_register_cmd_print_check) }, /* Edit menu */ { - "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), NULL, + "EditCutAction", "edit-cut", N_("Cu_t"), NULL, N_("Cut the current selection and copy it to clipboard"), G_CALLBACK (gnc_plugin_page_register_cmd_cut) }, { - "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), NULL, + "EditCopyAction", "edit-copy", N_("_Copy"), NULL, N_("Copy the current selection to clipboard"), G_CALLBACK (gnc_plugin_page_register_cmd_copy) }, { - "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL, + "EditPasteAction", "edit-paste", N_("_Paste"), NULL, N_("Paste the clipboard content at the cursor position"), G_CALLBACK (gnc_plugin_page_register_cmd_paste) }, @@ -252,12 +252,12 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = G_CALLBACK (gnc_plugin_page_register_cmd_edit_account) }, { - "EditFindAccountAction", GTK_STOCK_FIND, N_("F_ind Account"), "i", + "EditFindAccountAction", "edit-find", N_("F_ind Account"), "i", N_("Find an account"), G_CALLBACK (gnc_plugin_page_register_cmd_find_account) }, { - "EditFindTransactionsAction", GTK_STOCK_FIND, N_("_Find..."), "f", + "EditFindTransactionsAction", "edit-find", N_("_Find..."), "f", N_("Find transactions with a search"), G_CALLBACK (gnc_plugin_page_register_cmd_find_transactions) }, @@ -265,37 +265,37 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = /* Transaction menu */ { - "CutTransactionAction", GTK_STOCK_CUT, CUT_TRANSACTION_LABEL, "", + "CutTransactionAction", "edit-cut", CUT_TRANSACTION_LABEL, "", CUT_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_cut_transaction) }, { - "CopyTransactionAction", GTK_STOCK_COPY, COPY_TRANSACTION_LABEL, "", + "CopyTransactionAction", "edit-copy", COPY_TRANSACTION_LABEL, "", COPY_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_copy_transaction) }, { - "PasteTransactionAction", GTK_STOCK_PASTE, PASTE_TRANSACTION_LABEL, "", + "PasteTransactionAction", "edit-paste", PASTE_TRANSACTION_LABEL, "", PASTE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_paste_transaction) }, { - "DuplicateTransactionAction", GTK_STOCK_COPY, DUPLICATE_TRANSACTION_LABEL, "", + "DuplicateTransactionAction", "edit-copy", DUPLICATE_TRANSACTION_LABEL, "", DUPLICATE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_duplicate_transaction) }, { - "DeleteTransactionAction", GTK_STOCK_DELETE, DELETE_TRANSACTION_LABEL, NULL, + "DeleteTransactionAction", "edit-delete", DELETE_TRANSACTION_LABEL, NULL, DELETE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register_cmd_delete_transaction) }, { - "RemoveTransactionSplitsAction", GTK_STOCK_CLEAR, N_("Remo_ve Other Splits"), NULL, + "RemoveTransactionSplitsAction", "edit-clear", N_("Remo_ve Other Splits"), NULL, N_("Remove all splits in the current transaction"), G_CALLBACK (gnc_plugin_page_register_cmd_reinitialize_transaction) }, { - "RecordTransactionAction", GTK_STOCK_ADD, N_("_Enter Transaction"), NULL, + "RecordTransactionAction", "list-add", N_("_Enter Transaction"), NULL, N_("Record the current transaction"), G_CALLBACK (gnc_plugin_page_register_cmd_enter_transaction) }, @@ -371,7 +371,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = G_CALLBACK (gnc_plugin_page_register_cmd_lots) }, { - "BlankTransactionAction", GTK_STOCK_GOTO_BOTTOM, N_("_Blank Transaction"), "Page_Down", + "BlankTransactionAction", "go-bottom", N_("_Blank Transaction"), "Page_Down", N_("Move to the blank transaction at the bottom of the register"), G_CALLBACK (gnc_plugin_page_register_cmd_blank_transaction) }, diff --git a/src/gnome/gnc-plugin-page-register2.c b/src/gnome/gnc-plugin-page-register2.c index 3d26ca1427..04d770ea89 100644 --- a/src/gnome/gnc-plugin-page-register2.c +++ b/src/gnome/gnc-plugin-page-register2.c @@ -218,24 +218,24 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = /* File menu */ { - "FilePrintAction", GTK_STOCK_PRINT, N_("_Print Checks..."), "p", NULL, + "FilePrintAction", "document-print", N_("_Print Checks..."), "p", NULL, G_CALLBACK (gnc_plugin_page_register2_cmd_print_check) }, /* Edit menu */ { - "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), NULL, + "EditCutAction", "edit-cut", N_("Cu_t"), NULL, N_("Cut the current selection and copy it to clipboard"), G_CALLBACK (gnc_plugin_page_register2_cmd_cut) }, { - "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), NULL, + "EditCopyAction", "edit-copy", N_("_Copy"), NULL, N_("Copy the current selection to clipboard"), G_CALLBACK (gnc_plugin_page_register2_cmd_copy) }, { - "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL, + "EditPasteAction", "edit-paste", N_("_Paste"), NULL, N_("Paste the clipboard content at the cursor position"), G_CALLBACK (gnc_plugin_page_register2_cmd_paste) }, @@ -245,12 +245,12 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_edit_account) }, { - "EditFindAccountAction", GTK_STOCK_FIND, N_("F_ind Account"), "i", + "EditFindAccountAction", "edit-find", N_("F_ind Account"), "i", N_("Find an account"), G_CALLBACK (gnc_plugin_page_register2_cmd_find_account) }, { - "EditFindTransactionsAction", GTK_STOCK_FIND, N_("_Find..."), "f", + "EditFindTransactionsAction", "edit-find", N_("_Find..."), "f", N_("Find transactions with a search"), G_CALLBACK (gnc_plugin_page_register2_cmd_find_transactions) }, @@ -258,37 +258,37 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = /* Transaction menu */ { - "CutTransactionAction", GTK_STOCK_CUT, CUT_TRANSACTION_LABEL, "", + "CutTransactionAction", "edit-cut", CUT_TRANSACTION_LABEL, "", CUT_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register2_cmd_cut_transaction) }, { - "CopyTransactionAction", GTK_STOCK_COPY, COPY_TRANSACTION_LABEL, "", + "CopyTransactionAction", "edit-copy", COPY_TRANSACTION_LABEL, "", COPY_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register2_cmd_copy_transaction) }, { - "PasteTransactionAction", GTK_STOCK_PASTE, PASTE_TRANSACTION_LABEL, "", + "PasteTransactionAction", "edit-paste", PASTE_TRANSACTION_LABEL, "", PASTE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register2_cmd_paste_transaction) }, { - "DuplicateTransactionAction", GTK_STOCK_COPY, DUPLICATE_TRANSACTION_LABEL, "", + "DuplicateTransactionAction", "edit-copy", DUPLICATE_TRANSACTION_LABEL, "", DUPLICATE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register2_cmd_duplicate_transaction) }, { - "DeleteTransactionAction", GTK_STOCK_DELETE, DELETE_TRANSACTION_LABEL, NULL, + "DeleteTransactionAction", "edit-delete", DELETE_TRANSACTION_LABEL, NULL, DELETE_TRANSACTION_TIP, G_CALLBACK (gnc_plugin_page_register2_cmd_delete_transaction) }, { - "RemoveTransactionSplitsAction", GTK_STOCK_CLEAR, N_("Remo_ve All Splits"), NULL, + "RemoveTransactionSplitsAction", "edit-clear", N_("Remo_ve All Splits"), NULL, N_("Remove all splits in the current transaction"), G_CALLBACK (gnc_plugin_page_register2_cmd_reinitialize_transaction) }, { - "RecordTransactionAction", GTK_STOCK_ADD, N_("_Enter Transaction"), NULL, + "RecordTransactionAction", "list-add", N_("_Enter Transaction"), NULL, N_("Record the current transaction"), G_CALLBACK (gnc_plugin_page_register2_cmd_enter_transaction) }, @@ -310,12 +310,12 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_reverse_transaction) }, { - TRANSACTION_UP_ACTION, GTK_STOCK_GO_UP, N_("Move Transaction _Up"), NULL, + TRANSACTION_UP_ACTION, "go-up", N_("Move Transaction _Up"), NULL, N_("Move the current transaction one row upwards. Only available if the date and number of both rows are identical and the register window is sorted by date."), G_CALLBACK (gnc_plugin_page_register2_cmd_entryUp) }, { - TRANSACTION_DOWN_ACTION, GTK_STOCK_GO_DOWN, N_("Move Transaction Do_wn"), NULL, + TRANSACTION_DOWN_ACTION, "go-down", N_("Move Transaction Do_wn"), NULL, N_("Move the current transaction one row downwards. Only available if the date and number of both rows are identical and the register window is sorted by date."), G_CALLBACK (gnc_plugin_page_register2_cmd_entryDown) }, @@ -327,7 +327,7 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_view_filter_by) }, { - "ViewRefreshAction", GTK_STOCK_REFRESH, N_("_Refresh"), "r", + "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", N_("Refresh this window"), G_CALLBACK (gnc_plugin_page_register2_cmd_reload) }, @@ -360,7 +360,7 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_lots) }, { - "BlankTransactionAction", GTK_STOCK_GOTO_BOTTOM, N_("_Blank Transaction"), "Page_Down", + "BlankTransactionAction", "go-bottom", N_("_Blank Transaction"), "Page_Down", N_("Move to the blank transaction at the bottom of the register"), G_CALLBACK (gnc_plugin_page_register2_cmd_blank_transaction) }, diff --git a/src/gnome/gtkbuilder/dialog-new-user.glade b/src/gnome/gtkbuilder/dialog-new-user.glade index 9193838570..e2c4fa7bf2 100644 --- a/src/gnome/gtkbuilder/dialog-new-user.glade +++ b/src/gnome/gtkbuilder/dialog-new-user.glade @@ -72,7 +72,7 @@ True False - gtk-home + go-home 6 @@ -201,7 +201,7 @@ True False - gtk-home + go-home 6 diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 7ed393b698..f5d955ef39 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -2218,7 +2218,7 @@ static GtkActionEntry recnWindow_actions [] = G_CALLBACK(recnFinishCB) }, { - "RecnPostponeAction", GTK_STOCK_GO_BACK, N_("_Postpone"), "p", + "RecnPostponeAction", "go-previous", N_("_Postpone"), "p", N_("Postpone the reconciliation of this account"), G_CALLBACK(recnPostponeCB) }, @@ -2231,7 +2231,7 @@ static GtkActionEntry recnWindow_actions [] = /* Account menu */ { - "AccountOpenAccountAction", GTK_STOCK_JUMP_TO, N_("_Open Account"), NULL, + "AccountOpenAccountAction", "go-jump", N_("_Open Account"), NULL, N_("Open the account"), G_CALLBACK(gnc_recn_open_cb) }, @@ -2255,17 +2255,17 @@ static GtkActionEntry recnWindow_actions [] = /* Transaction menu */ { - "TransBalanceAction", GTK_STOCK_NEW, N_("_Balance"), "b", + "TransBalanceAction", "document-new", N_("_Balance"), "b", N_("Add a new balancing entry to the account"), G_CALLBACK(gnc_ui_reconcile_window_balance_cb) }, { - "TransEditAction", GTK_STOCK_PROPERTIES, N_("_Edit"), "e", + "TransEditAction", "document-properties", N_("_Edit"), "e", N_("Edit the current transaction"), G_CALLBACK(gnc_ui_reconcile_window_edit_cb) }, { - "TransDeleteAction", GTK_STOCK_DELETE, N_("_Delete"), "d", + "TransDeleteAction", "edit-delete", N_("_Delete"), "d", N_("Delete the selected transaction"), G_CALLBACK(gnc_ui_reconcile_window_delete_cb) }, @@ -2275,7 +2275,7 @@ static GtkActionEntry recnWindow_actions [] = G_CALLBACK(gnc_ui_reconcile_window_rec_cb) }, { - "TransUnRecAction", GTK_STOCK_CLEAR, N_("_Unreconcile Selection"), "u", + "TransUnRecAction", "edit-clear", N_("_Unreconcile Selection"), "u", N_("Unreconcile the selected transactions"), G_CALLBACK(gnc_ui_reconcile_window_unrec_cb) }, diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index ac12383ca5..26921248da 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -2178,7 +2178,7 @@ static GtkActionEntry recnWindow2_actions [] = G_CALLBACK(recnFinishCB) }, { - "RecnPostponeAction", GTK_STOCK_GO_BACK, N_("_Postpone"), "p", + "RecnPostponeAction", "go-previous", N_("_Postpone"), "p", N_("Postpone the reconciliation of this account"), G_CALLBACK(recnPostponeCB) }, @@ -2191,7 +2191,7 @@ static GtkActionEntry recnWindow2_actions [] = /* Account menu */ { - "AccountOpenAccountAction", GTK_STOCK_JUMP_TO, N_("_Open Account"), NULL, + "AccountOpenAccountAction", "go-jump", N_("_Open Account"), NULL, N_("Open the account"), G_CALLBACK(gnc_recn_open_cb) }, @@ -2215,17 +2215,17 @@ static GtkActionEntry recnWindow2_actions [] = /* Transaction menu */ { - "TransBalanceAction", GTK_STOCK_NEW, N_("_Balance"), "b", + "TransBalanceAction", "document-new", N_("_Balance"), "b", N_("Add a new balancing entry to the account"), G_CALLBACK(gnc_ui_reconcile_window_balance_cb) }, { - "TransEditAction", GTK_STOCK_PROPERTIES, N_("_Edit"), "e", + "TransEditAction", "document-properties", N_("_Edit"), "e", N_("Edit the current transaction"), G_CALLBACK(gnc_ui_reconcile_window_edit_cb) }, { - "TransDeleteAction", GTK_STOCK_DELETE, N_("_Delete"), "d", + "TransDeleteAction", "edit-delete", N_("_Delete"), "d", N_("Delete the selected transaction"), G_CALLBACK(gnc_ui_reconcile_window_delete_cb) }, @@ -2235,7 +2235,7 @@ static GtkActionEntry recnWindow2_actions [] = G_CALLBACK(gnc_ui_reconcile_window_rec_cb) }, { - "TransUnRecAction", GTK_STOCK_CLEAR, N_("_Unreconcile Selection"), "u", + "TransUnRecAction", "edit-clear", N_("_Unreconcile Selection"), "u", N_("Unreconcile the selected transactions"), G_CALLBACK(gnc_ui_reconcile_window_unrec_cb) }, diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.cpp b/src/import-export/csv-imp/assistant-csv-trans-import.cpp index 473c77fb7d..f718e44573 100644 --- a/src/import-export/csv-imp/assistant-csv-trans-import.cpp +++ b/src/import-export/csv-imp/assistant-csv-trans-import.cpp @@ -1145,11 +1145,11 @@ enum static GnumericPopupMenuElement const popup_elements[] = { { - N_("Merge with column on _left"), GTK_STOCK_REMOVE, + N_("Merge with column on _left"), "list-remove", 0, 1 << CONTEXT_STF_IMPORT_MERGE_LEFT, CONTEXT_STF_IMPORT_MERGE_LEFT }, { - N_("Merge with column on _right"), GTK_STOCK_REMOVE, + N_("Merge with column on _right"), "list-remove", 0, 1 << CONTEXT_STF_IMPORT_MERGE_RIGHT, CONTEXT_STF_IMPORT_MERGE_RIGHT }, { "", nullptr, 0, 0, 0 }, @@ -1159,11 +1159,11 @@ static GnumericPopupMenuElement const popup_elements[] = }, { "", nullptr, 0, 0, 0 }, { - N_("_Widen this column"), GTK_STOCK_GO_FORWARD, + N_("_Widen this column"), "go-next", 0, 1 << CONTEXT_STF_IMPORT_WIDEN, CONTEXT_STF_IMPORT_WIDEN }, { - N_("_Narrow this column"), GTK_STOCK_GO_BACK, + N_("_Narrow this column"), "go-previous", 0, 1 << CONTEXT_STF_IMPORT_NARROW, CONTEXT_STF_IMPORT_NARROW }, { nullptr, nullptr, 0, 0, 0 }, @@ -1333,7 +1333,7 @@ CsvImpTransAssist::preview_row_fill_state_cells (GtkListStore *store, GtkTreeIte fcolor = "black"; bcolor = "pink"; c_err_msg = err_msg.c_str(); - icon_name = GTK_STOCK_DIALOG_ERROR; + icon_name = "dialog-error"; } gtk_list_store_set (store, iter, PREV_COL_FCOLOR, fcolor, diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.glade b/src/import-export/csv-imp/assistant-csv-trans-import.glade index f68902bb95..fdb2facf7c 100644 --- a/src/import-export/csv-imp/assistant-csv-trans-import.glade +++ b/src/import-export/csv-imp/assistant-csv-trans-import.glade @@ -130,7 +130,7 @@ Select location and file name for the Import, then click 'OK'... True False - gtk-delete + edit-delete @@ -155,7 +155,7 @@ Select location and file name for the Import, then click 'OK'... True False - gtk-save + document-save @@ -415,7 +415,7 @@ Select location and file name for the Import, then click 'OK'... True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-dialog-info + dialog-info False @@ -917,7 +917,7 @@ For example True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-dialog-info + dialog-info False