From 96bd2f271ad357e474ce5fd732b41b98d9a9b408 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Tue, 27 Jun 2017 14:08:54 +0100 Subject: [PATCH] Rename use of icon defines to reflect changes in icon.h --- .../business-gnome/gnc-plugin-business.c | 4 +-- .../business-gnome/gnc-plugin-page-invoice.c | 14 +++++----- .../gnc-plugin-page-owner-tree.c | 22 ++++++++-------- src/gnome-utils/gnc-tree-view-account.c | 2 +- src/gnome-utils/gnc-tree-view.c | 12 ++++----- src/gnome-utils/gnc-tree-view.h | 10 +++---- src/gnome/gnc-plugin-page-account-tree.c | 26 +++++++++---------- src/gnome/gnc-plugin-page-budget.c | 8 +++--- src/gnome/gnc-plugin-page-register.c | 12 ++++----- src/gnome/gnc-plugin-page-register2.c | 12 ++++----- src/gnome/gnc-plugin-page-sx-list.c | 12 ++++----- .../report-gnome/gnc-plugin-page-report.c | 4 +-- 12 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/business/business-gnome/gnc-plugin-business.c b/src/business/business-gnome/gnc-plugin-business.c index 422e3eaa54..5bcc5a63c7 100644 --- a/src/business/business-gnome/gnc-plugin-business.c +++ b/src/business/business-gnome/gnc-plugin-business.c @@ -47,7 +47,7 @@ #include "gnc-file.h" #include "guile-mappings.h" #include "gnc-session.h" -#include "gnome-utils/gnc-icons.h" /* for GNC_STOCK_INVOICE_NEW */ +#include "gnome-utils/gnc-icons.h" /* for GNC_ICON_INVOICE_NEW */ #include "gnc-prefs.h" #include "gnome-utils/gnc-main-window.h" @@ -308,7 +308,7 @@ static GtkActionEntry gnc_plugin_actions [] = /* Toolbar */ { - "ToolbarNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice..."), NULL, + "ToolbarNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice..."), NULL, N_("Open the New Invoice dialog"), G_CALLBACK (gnc_plugin_business_cmd_customer_new_invoice) }, diff --git a/src/business/business-gnome/gnc-plugin-page-invoice.c b/src/business/business-gnome/gnc-plugin-page-invoice.c index e7fea59ce8..e71cd9e5ed 100644 --- a/src/business/business-gnome/gnc-plugin-page-invoice.c +++ b/src/business/business-gnome/gnc-plugin-page-invoice.c @@ -99,7 +99,7 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = /* File menu */ { - "FileNewAccountAction", GNC_STOCK_NEW_ACCOUNT, N_("New _Account..."), NULL, + "FileNewAccountAction", GNC_ICON_NEW_ACCOUNT, N_("New _Account..."), NULL, N_("Create a new account"), G_CALLBACK (gnc_plugin_page_invoice_cmd_new_account) }, @@ -126,22 +126,22 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = G_CALLBACK (gnc_plugin_page_invoice_cmd_paste) }, { - "EditEditInvoiceAction", GNC_STOCK_INVOICE_EDIT, N_("_Edit Invoice"), NULL, + "EditEditInvoiceAction", GNC_ICON_INVOICE_EDIT, N_("_Edit Invoice"), NULL, N_("Edit this invoice"), G_CALLBACK (gnc_plugin_page_invoice_cmd_edit) }, { - "EditDuplicateInvoiceAction", GNC_STOCK_INVOICE_DUPLICATE, N_("_Duplicate Invoice"), + "EditDuplicateInvoiceAction", GNC_ICON_INVOICE_DUPLICATE, N_("_Duplicate Invoice"), NULL, N_("Create a new invoice as a duplicate of the current one"), G_CALLBACK (gnc_plugin_page_invoice_cmd_duplicateInvoice) }, { - "EditPostInvoiceAction", GNC_STOCK_INVOICE_POST, N_("_Post Invoice"), NULL, + "EditPostInvoiceAction", GNC_ICON_INVOICE_POST, N_("_Post Invoice"), NULL, N_("Post this Invoice to your Chart of Accounts"), G_CALLBACK (gnc_plugin_page_invoice_cmd_post) }, { - "EditUnpostInvoiceAction", GNC_STOCK_INVOICE_UNPOST, N_("_Unpost Invoice"), NULL, + "EditUnpostInvoiceAction", GNC_ICON_INVOICE_UNPOST, N_("_Unpost Invoice"), NULL, N_("Unpost this Invoice and make it editable"), G_CALLBACK (gnc_plugin_page_invoice_cmd_unpost) }, @@ -185,12 +185,12 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] = /* Business menu */ { - "BusinessNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice"), "", + "BusinessNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice"), "", N_("Create a new invoice for the same owner as the current one"), G_CALLBACK (gnc_plugin_page_invoice_cmd_new_invoice) }, { - "ToolsProcessPaymentAction", GNC_STOCK_INVOICE_PAY, N_("_Pay Invoice"), NULL, + "ToolsProcessPaymentAction", GNC_ICON_INVOICE_PAY, N_("_Pay Invoice"), NULL, N_("Enter a payment for the owner of this Invoice"), G_CALLBACK (gnc_plugin_page_invoice_cmd_pay_invoice) }, 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 85ebe8696c..1af81fd684 100644 --- a/src/business/business-gnome/gnc-plugin-page-owner-tree.c +++ b/src/business/business-gnome/gnc-plugin-page-owner-tree.c @@ -138,39 +138,39 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] = /* Edit menu */ { - "OTEditVendorAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Vendor"), "e", + "OTEditVendorAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Vendor"), "e", N_("Edit the selected vendor"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner) }, { - "OTEditCustomerAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Customer"), "e", + "OTEditCustomerAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Customer"), "e", N_("Edit the selected customer"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner) }, { - "OTEditEmployeeAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Employee"), "e", + "OTEditEmployeeAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Employee"), "e", N_("Edit the selected employee"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner) }, { - "OTNewVendorAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Vendor..."), NULL, + "OTNewVendorAction", GNC_ICON_NEW_ACCOUNT, N_("_New Vendor..."), NULL, N_("Create a new vendor"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner) }, { - "OTNewCustomerAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Customer..."), NULL, + "OTNewCustomerAction", GNC_ICON_NEW_ACCOUNT, N_("_New Customer..."), NULL, N_("Create a new customer"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner) }, { - "OTNewEmployeeAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Employee..."), NULL, + "OTNewEmployeeAction", GNC_ICON_NEW_ACCOUNT, N_("_New Employee..."), NULL, N_("Create a new employee"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner) }, #if 0 /* Disabled due to crash */ { - "EditDeleteOwnerAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete Owner..."), "Delete", + "EditDeleteOwnerAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete Owner..."), "Delete", N_("Delete selected owner"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_delete_owner) }, @@ -184,17 +184,17 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] = /* Business menu */ { - "OTNewBillAction", GNC_STOCK_INVOICE_NEW, N_("New _Bill..."), NULL, + "OTNewBillAction", GNC_ICON_INVOICE_NEW, N_("New _Bill..."), NULL, N_("Create a new bill"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice) }, { - "OTNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice..."), NULL, + "OTNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice..."), NULL, N_("Create a new invoice"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice) }, { - "OTNewVoucherAction", GNC_STOCK_INVOICE_NEW, N_("New _Voucher..."), NULL, + "OTNewVoucherAction", GNC_ICON_INVOICE_NEW, N_("New _Voucher..."), NULL, N_("Create a new voucher"), G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice) }, @@ -397,7 +397,7 @@ gnc_plugin_page_owner_tree_class_init (GncPluginPageOwnerTreeClass *klass) object_class->finalize = gnc_plugin_page_owner_tree_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT; + gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_OWNER_TREE_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_owner_tree_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_owner_tree_destroy_widget; diff --git a/src/gnome-utils/gnc-tree-view-account.c b/src/gnome-utils/gnc-tree-view-account.c index 0eeb893d4e..83fdf388f0 100644 --- a/src/gnome-utils/gnc-tree-view-account.c +++ b/src/gnome-utils/gnc-tree-view-account.c @@ -718,7 +718,7 @@ gnc_tree_view_account_new_with_root (Account *root, gboolean show_root) priv->name_column = gnc_tree_view_add_text_column(view, _("Account Name"), "name", - GNC_STOCK_ACCOUNT, "Expenses:Entertainment", + GNC_ICON_ACCOUNT, "Expenses:Entertainment", GNC_TREE_MODEL_ACCOUNT_COL_NAME, GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS, sort_by_string); diff --git a/src/gnome-utils/gnc-tree-view.c b/src/gnome-utils/gnc-tree-view.c index d69687cf30..1966566b41 100644 --- a/src/gnome-utils/gnc-tree-view.c +++ b/src/gnome-utils/gnc-tree-view.c @@ -1771,7 +1771,7 @@ GtkTreeViewColumn * gnc_tree_view_add_text_column (GncTreeView *view, const gchar *column_title, const gchar *pref_name, - const gchar *stock_icon_name, + const gchar *icon_name, const gchar *sizing_text, gint model_data_column, gint model_visibility_column, @@ -1788,10 +1788,10 @@ gnc_tree_view_add_text_column (GncTreeView *view, gtk_tree_view_column_set_title (column, column_title); /* Set up an icon renderer if requested */ - if (stock_icon_name) + if (icon_name) { renderer = gtk_cell_renderer_pixbuf_new (); - g_object_set (renderer, "stock-id", stock_icon_name, NULL); + g_object_set (renderer, "icon-name", icon_name, NULL); gtk_tree_view_column_pack_start (column, renderer, FALSE); } @@ -1838,7 +1838,7 @@ GtkTreeViewColumn * gnc_tree_view_add_date_column (GncTreeView *view, const gchar *column_title, const gchar *pref_name, - const gchar *stock_icon_name, + const gchar *icon_name, const gchar *sizing_text, gint model_data_column, gint model_visibility_column, @@ -1855,10 +1855,10 @@ gnc_tree_view_add_date_column (GncTreeView *view, gtk_tree_view_column_set_title (column, column_title); /* Set up an icon renderer if requested */ - if (stock_icon_name) + if (icon_name) { renderer = gtk_cell_renderer_pixbuf_new (); - g_object_set (renderer, "stock-id", stock_icon_name, NULL); + g_object_set (renderer, "icon-name", icon_name, NULL); gtk_tree_view_column_pack_start (column, renderer, FALSE); } diff --git a/src/gnome-utils/gnc-tree-view.h b/src/gnome-utils/gnc-tree-view.h index e9b56da9bc..27f01f60aa 100644 --- a/src/gnome-utils/gnc-tree-view.h +++ b/src/gnome-utils/gnc-tree-view.h @@ -164,10 +164,10 @@ gnc_tree_view_add_toggle_column (GncTreeView *view, * used in several functions to look up the column, and it is also * used when saving/restoring the view's state. * - * @param stock_icon_name The name of the stock icon to display to + * @param icon_name The name of the icon to display to * the left of the text in this column. Used for adding icons like - * the "account" icon to a view. This must be a registered stock - * icon, not a filename. + * the "account" icon to a view. This must be a registered icon, + * not a filename. * * @param sizing_text A string used to compute the default width of * the column. This text is never displayed. @@ -193,7 +193,7 @@ GtkTreeViewColumn * gnc_tree_view_add_text_column (GncTreeView *view, const gchar *column_title, const gchar *pref_name, - const gchar *stock_icon_name, + const gchar *icon_name, const gchar *sizing_text, gint model_data_column, gint model_visibility_column, @@ -226,7 +226,7 @@ GtkTreeViewColumn * gnc_tree_view_add_date_column (GncTreeView *view, const gchar *column_title, const gchar *pref_name, - const gchar *stock_icon_name, + const gchar *icon_name, const gchar *sizing_text, gint model_data_column, gint model_visibility_column, diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index 72de2c6966..88cddbdc97 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -166,29 +166,29 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = /* File menu */ { - "FileNewAccountAction", GNC_STOCK_NEW_ACCOUNT, N_("New _Account..."), NULL, + "FileNewAccountAction", GNC_ICON_NEW_ACCOUNT, N_("New _Account..."), NULL, N_("Create a new Account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_new_account) }, { - "FileAddAccountHierarchyAssistantAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL, + "FileAddAccountHierarchyAssistantAction", GNC_ICON_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL, N_("Extend the current book by merging with new account type categories"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy) }, #ifdef REGISTER2_ENABLED { - "FileOpenAccount2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL, + "FileOpenAccount2Action", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, N_("Open the selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account) }, { - "FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Old Style Register Account"), NULL, + "FileOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Old Style Register Account"), NULL, N_("Open the old style register selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account) }, #else { - "FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL, + "FileOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, N_("Open the selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account) }, @@ -196,18 +196,18 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = #ifdef REGISTER2_ENABLED { - "FileOpenSubaccounts2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, + "FileOpenSubaccounts2Action", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, N_("Open the selected account and all its subaccounts"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_subaccounts) }, { - "FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open Old St_yle Subaccounts"), NULL, + "FileOpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open Old St_yle Subaccounts"), NULL, N_("Open the old style register selected account and all its subaccounts"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts) }, #else { - "FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, + "FileOpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, N_("Open the selected account and all its subaccounts"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts) }, @@ -215,12 +215,12 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = /* Edit menu */ { - "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit _Account"), "e", + "EditEditAccountAction", GNC_ICON_EDIT_ACCOUNT, N_("Edit _Account"), "e", N_("Edit the selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_edit_account) }, { - "EditDeleteAccountAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete Account..."), "Delete", + "EditDeleteAccountAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete Account..."), "Delete", N_("Delete selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_delete_account) }, @@ -291,12 +291,12 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] = /* Extensions Menu */ { "Register2TestAction", NULL, N_("_Register2"), NULL, NULL, NULL }, { - "Register2TestAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL, + "Register2TestAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, N_("Open the selected account"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account) }, { - "Register2TestSubAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, + "Register2TestSubAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, N_("Open the selected account and all its subaccounts"), G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_subaccounts) }, @@ -412,7 +412,7 @@ gnc_plugin_page_account_tree_class_init (GncPluginPageAccountTreeClass *klass) object_class->finalize = gnc_plugin_page_account_tree_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT; + gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_account_tree_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_account_tree_destroy_widget; diff --git a/src/gnome/gnc-plugin-page-budget.c b/src/gnome/gnc-plugin-page-budget.c index d2854d012d..0cc99064b2 100644 --- a/src/gnome/gnc-plugin-page-budget.c +++ b/src/gnome/gnc-plugin-page-budget.c @@ -123,12 +123,12 @@ static GtkActionEntry gnc_plugin_page_budget_actions [] = /* File menu */ { - "OpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL, + "OpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, N_("Open the selected account"), G_CALLBACK (gnc_plugin_page_budget_cmd_open_account) }, { - "OpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, + "OpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Subaccounts"), NULL, N_("Open the selected account and all its subaccounts"), G_CALLBACK (gnc_plugin_page_budget_cmd_open_subaccounts) @@ -136,7 +136,7 @@ static GtkActionEntry gnc_plugin_page_budget_actions [] = /* Edit menu */ { - "DeleteBudgetAction", GNC_STOCK_DELETE_BUDGET, N_("_Delete Budget"), + "DeleteBudgetAction", GNC_ICON_DELETE_BUDGET, N_("_Delete Budget"), NULL, N_("Delete this budget"), G_CALLBACK (gnc_plugin_page_budget_cmd_delete_budget) }, @@ -287,7 +287,7 @@ gnc_plugin_page_budget_class_init (GncPluginPageBudgetClass *klass) object_class->finalize = gnc_plugin_page_budget_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_BUDGET; + gnc_plugin_class->tab_icon = GNC_ICON_BUDGET; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_BUDGET_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_budget_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_budget_destroy_widget; diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index f7eae111cc..519f64759f 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -247,7 +247,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = G_CALLBACK (gnc_plugin_page_register_cmd_paste) }, { - "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit _Account"), "e", + "EditEditAccountAction", GNC_ICON_EDIT_ACCOUNT, N_("Edit _Account"), "e", N_("Edit the selected account"), G_CALLBACK (gnc_plugin_page_register_cmd_edit_account) }, @@ -346,7 +346,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = /* Actions menu */ { - "ActionsTransferAction", GNC_STOCK_TRANSFER, N_("_Transfer..."), "t", + "ActionsTransferAction", GNC_ICON_TRANSFER, N_("_Transfer..."), "t", N_("Transfer funds from one account to another"), G_CALLBACK (gnc_plugin_page_register_cmd_transfer) }, @@ -381,12 +381,12 @@ static GtkActionEntry gnc_plugin_page_register_actions [] = G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) }, { - "JumpTransactionAction", GNC_STOCK_JUMP_TO, N_("_Jump"), NULL, + "JumpTransactionAction", GNC_ICON_JUMP_TO, N_("_Jump"), NULL, N_("Jump to the corresponding transaction in the other account"), G_CALLBACK (gnc_plugin_page_register_cmd_jump) }, { - "ScheduleTransactionAction", GNC_STOCK_SCHEDULE, N_("Sche_dule..."), NULL, + "ScheduleTransactionAction", GNC_ICON_SCHEDULE, N_("Sche_dule..."), NULL, N_("Create a Scheduled Transaction with the current transaction as a template"), G_CALLBACK (gnc_plugin_page_register_cmd_schedule) }, @@ -424,7 +424,7 @@ static GtkToggleActionEntry toggle_entries[] = }, { - "SplitTransactionAction", GNC_STOCK_SPLIT_TRANS, N_("S_plit Transaction"), NULL, + "SplitTransactionAction", GNC_ICON_SPLIT_TRANS, N_("S_plit Transaction"), NULL, N_("Show all splits in the current transaction"), G_CALLBACK (gnc_plugin_page_register_cmd_expand_transaction), FALSE }, @@ -736,7 +736,7 @@ gnc_plugin_page_register_class_init (GncPluginPageRegisterClass *klass) object_class->finalize = gnc_plugin_page_register_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT; + gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_REGISTER_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_register_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_register_destroy_widget; diff --git a/src/gnome/gnc-plugin-page-register2.c b/src/gnome/gnc-plugin-page-register2.c index d7fe4b6c69..fbc414c188 100644 --- a/src/gnome/gnc-plugin-page-register2.c +++ b/src/gnome/gnc-plugin-page-register2.c @@ -240,7 +240,7 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_paste) }, { - "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit _Account"), "e", + "EditEditAccountAction", GNC_ICON_EDIT_ACCOUNT, N_("Edit _Account"), "e", N_("Edit the selected account"), G_CALLBACK (gnc_plugin_page_register2_cmd_edit_account) }, @@ -335,7 +335,7 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = /* Actions menu */ { - "ActionsTransferAction", GNC_STOCK_TRANSFER, N_("_Transfer..."), "t", + "ActionsTransferAction", GNC_ICON_TRANSFER, N_("_Transfer..."), "t", N_("Transfer funds from one account to another"), G_CALLBACK (gnc_plugin_page_register2_cmd_transfer) }, @@ -370,12 +370,12 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] = G_CALLBACK (gnc_plugin_page_register2_cmd_exchange_rate) }, { - "JumpTransactionAction", GNC_STOCK_JUMP_TO, N_("_Jump"), NULL, + "JumpTransactionAction", GNC_ICON_JUMP_TO, N_("_Jump"), NULL, N_("Jump to the corresponding transaction in the other account"), G_CALLBACK (gnc_plugin_page_register2_cmd_jump) }, { - "ScheduleTransactionAction", GNC_STOCK_SCHEDULE, N_("Sche_dule..."), NULL, + "ScheduleTransactionAction", GNC_ICON_SCHEDULE, N_("Sche_dule..."), NULL, N_("Create a Scheduled Transaction with the current transaction as a template"), G_CALLBACK (gnc_plugin_page_register2_cmd_schedule) }, @@ -419,7 +419,7 @@ static GtkToggleActionEntry toggle_entries[] = }, { - "SplitTransactionAction", GNC_STOCK_SPLIT_TRANS, N_("S_plit Transaction"), NULL, + "SplitTransactionAction", GNC_ICON_SPLIT_TRANS, N_("S_plit Transaction"), NULL, N_("Show all splits in the current transaction"), G_CALLBACK (gnc_plugin_page_register2_cmd_expand_transaction), FALSE }, @@ -727,7 +727,7 @@ gnc_plugin_page_register2_class_init (GncPluginPageRegister2Class *klass) object_class->finalize = gnc_plugin_page_register2_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT; + gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_REGISTER2_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_register2_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_register2_destroy_widget; diff --git a/src/gnome/gnc-plugin-page-sx-list.c b/src/gnome/gnc-plugin-page-sx-list.c index 234a24a3e2..c410e242f5 100644 --- a/src/gnome/gnc-plugin-page-sx-list.c +++ b/src/gnome/gnc-plugin-page-sx-list.c @@ -131,31 +131,31 @@ static GtkActionEntry gnc_plugin_page_sx_list_actions [] = { { "SxListAction", NULL, N_("_Scheduled"), NULL, NULL, NULL }, { - "SxListNewAction", GNC_STOCK_NEW_ACCOUNT, N_("_New"), NULL, + "SxListNewAction", GNC_ICON_NEW_ACCOUNT, N_("_New"), NULL, N_("Create a new scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new) }, #ifdef REGISTER2_ENABLED /*################## Added for Reg2 #################*/ { - "SxListNewAction2", GNC_STOCK_NEW_ACCOUNT, N_("_New 2"), NULL, + "SxListNewAction2", GNC_ICON_NEW_ACCOUNT, N_("_New 2"), NULL, N_("Create a new scheduled transaction 2"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new2) }, /*################## Added for Reg2 #################*/ #endif { - "SxListEditAction", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit"), NULL, + "SxListEditAction", GNC_ICON_EDIT_ACCOUNT, N_("_Edit"), NULL, N_("Edit the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit) }, #ifdef REGISTER2_ENABLED /*################## Added for Reg2 #################*/ { - "SxListEditAction2", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit 2"), NULL, + "SxListEditAction2", GNC_ICON_EDIT_ACCOUNT, N_("_Edit 2"), NULL, N_("Edit the selected scheduled transaction 2"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit2) }, /*################## Added for Reg2 #################*/ #endif { - "SxListDeleteAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete"), NULL, + "SxListDeleteAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete"), NULL, N_("Delete the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_delete) }, }; @@ -218,7 +218,7 @@ gnc_plugin_page_sx_list_class_init (GncPluginPageSxListClass *klass) object_class->dispose = gnc_plugin_page_sx_list_dispose; object_class->finalize = gnc_plugin_page_sx_list_finalize; - gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT; + gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT; gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_SX_LIST_NAME; gnc_plugin_class->create_widget = gnc_plugin_page_sx_list_create_widget; gnc_plugin_class->destroy_widget = gnc_plugin_page_sx_list_destroy_widget; diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/src/report/report-gnome/gnc-plugin-page-report.c index 2ceb8b95db..75c53ece9b 100644 --- a/src/report/report-gnome/gnc-plugin-page-report.c +++ b/src/report/report-gnome/gnc-plugin-page-report.c @@ -271,7 +271,7 @@ gnc_plugin_page_report_class_init (GncPluginPageReportClass *klass) object_class->set_property = gnc_plugin_page_report_set_property; object_class->get_property = gnc_plugin_page_report_get_property; - gnc_plugin_page_class->tab_icon = GNC_STOCK_ACCOUNT_REPORT; + gnc_plugin_page_class->tab_icon = GNC_ICON_ACCOUNT_REPORT; gnc_plugin_page_class->plugin_name = GNC_PLUGIN_PAGE_REPORT_NAME; gnc_plugin_page_class->create_widget = gnc_plugin_page_report_create_widget; @@ -1129,7 +1129,7 @@ gnc_plugin_page_report_constr_init(GncPluginPageReport *plugin_page, gint report G_CALLBACK(gnc_plugin_page_report_print_cb) }, { - "FilePrintPDFAction", GNC_STOCK_PDF_EXPORT, N_("Export as P_DF..."), NULL, + "FilePrintPDFAction", GNC_ICON_PDF_EXPORT, N_("Export as P_DF..."), NULL, N_("Export the current report as a PDF document"), G_CALLBACK(gnc_plugin_page_report_exportpdf_cb) },