diff --git a/gnucash/gnome-utils/gnc-main-window.cpp b/gnucash/gnome-utils/gnc-main-window.cpp index 32281cb30a..184c44da0f 100644 --- a/gnucash/gnome-utils/gnc-main-window.cpp +++ b/gnucash/gnome-utils/gnc-main-window.cpp @@ -356,133 +356,6 @@ static GActionEntry gnc_menu_actions [] = /** The number of actions provided by the main window. */ static guint gnc_menu_n_actions = G_N_ELEMENTS(gnc_menu_actions); -static GncDisplayItem gnc_menu_display_items [] = -{ - /* File menu */ - { "FileImportAction", nullptr, N_("_Import"), nullptr, nullptr }, - { "FileExportAction", nullptr, N_("_Export"), nullptr, nullptr }, - { - "FilePrintAction", "document-print", N_("_Print..."), "p", - N_("Print the currently active page") - }, -#ifndef GTK_STOCK_PAGE_SETUP -# define GTK_STOCK_PAGE_SETUP nullptr -#endif - { - "FilePageSetupAction", "document-page-setup", N_("Pa_ge Setup..."), "p", - N_("Specify the page size and orientation for printing") - }, - { - "FilePropertiesAction", "document-properties", N_("Proper_ties"), "Return", - N_("Edit the properties of the current file") - }, - { - "FileCloseAction", "window-close", N_("_Close"), "W", - N_("Close the currently active page") - }, - { - "FileQuitAction", "application-exit", N_("_Quit"), "Q", - N_("Quit this application") - }, - /* Edit menu */ - { - "EditCutAction", "edit-cut", N_("Cu_t"), "X", - N_("Cut the current selection and copy it to clipboard") - }, - { - "EditCopyAction", "edit-copy", N_("_Copy"), "C", - N_("Copy the current selection to clipboard") - }, - { - "EditPasteAction", "edit-paste", N_("_Paste"), "V", - N_("Paste the clipboard content at the cursor position") - }, - { - "EditPreferencesAction", "preferences-system", N_("Pr_eferences"), nullptr, - N_("Edit the global preferences of GnuCash") - }, - /* View menu */ - { "ViewTabPositionAction", nullptr, N_("Tab P_osition"), nullptr, nullptr }, - { - "ViewSortByAction", nullptr, N_("_Sort By..."), nullptr, - N_("Select sorting criteria for this page view") - }, - { - "ViewFilterByAction", nullptr, N_("_Filter By..."), nullptr, - N_("Select the account types that should be displayed.") - }, - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, - /* Actions menu */ - { "ScrubMenuAction", nullptr, N_("_Check & Repair"), nullptr, nullptr }, - { - "ActionsForgetWarningsAction", nullptr, N_("Reset _Warnings..."), nullptr, - N_("Reset the state of all warning messages so they will be shown again.") - }, - { - "ActionsRenamePageAction", nullptr, N_("Re_name Page"), nullptr, - N_("Rename this page.") - }, - /* Windows menu */ - { - "WindowNewAction", nullptr, N_("_New Window"), nullptr, - N_("Open a new top-level GnuCash window.") - }, - { - "WindowMovePageAction", nullptr, N_("New Window with _Page"), nullptr, - N_("Move the current page to a new top-level GnuCash window.") - }, - /* Help menu */ - { - "HelpTutorialAction", "help-browser", N_("Tutorial and Concepts _Guide"), "H", - N_("Open the GnuCash Tutorial") - }, - { - "HelpContentsAction", "help-browser", N_("_Contents"), "F1", - N_("Open the GnuCash Help") - }, - { - "HelpAboutAction", "help-about", N_("_About"), nullptr, - N_("About GnuCash") - }, - /* Toggle actions */ - { - "ViewToolbarAction", nullptr, N_("_Toolbar"), nullptr, - N_("Show/hide the toolbar on this window") - }, - { - "ViewSummaryAction", nullptr, N_("Su_mmary Bar"), nullptr, - N_("Show/hide the summary bar on this window") - }, - { - "ViewStatusbarAction", nullptr, N_("Stat_us Bar"), nullptr, - N_("Show/hide the status bar on this window") - }, - { "ViewTabPositionAction", nullptr, N_("Tab P_osition"), nullptr, - nullptr - }, - { - "ViewTabPositionTopAction", nullptr, N_("To_p"), nullptr, - N_("Display the notebook tabs at the top of the window.") - }, - { - "ViewTabPositionBottomAction", nullptr, N_("B_ottom"), nullptr, - N_("Display the notebook tabs at the bottom of the window.") - }, - { - "ViewTabPositionLeftAction", nullptr, N_("_Left"), nullptr, - N_("Display the notebook tabs at the left of the window.") - }, - { - "ViewTabPositionRightAction", nullptr, N_("_Right"), nullptr, - N_("Display the notebook tabs at the right of the window.") - }, -}; -/** The number of display items provided by the main window. */ -static guint gnc_menu_n_display_items = G_N_ELEMENTS(gnc_menu_display_items); - /** The following are in the main window so they will always be * present in the menu structure, but they are never sensitive. * These actions should be overridden in child windows where they @@ -3619,8 +3492,6 @@ gnc_main_window_merge_actions (GncMainWindow *window, const gchar *group_name, GActionEntry *actions, guint n_actions, - GncDisplayItem *display_items, - guint n_display_items, const gchar **ui_updates, const gchar *ui_filename, gpointer user_data) diff --git a/gnucash/gnome-utils/gnc-main-window.h b/gnucash/gnome-utils/gnc-main-window.h index 8a0d49430c..87bdd5fd03 100644 --- a/gnucash/gnome-utils/gnc-main-window.h +++ b/gnucash/gnome-utils/gnc-main-window.h @@ -55,15 +55,6 @@ extern "C" /* typedefs & structures */ -typedef struct -{ - const gchar *action_name; - const gchar *icon_name; - const gchar *label; - const gchar *accelerator; - const gchar *tooltip; -} GncDisplayItem; - typedef struct { const gchar *actions; @@ -243,10 +234,6 @@ void gnc_main_window_manual_merge_actions (GncMainWindow *window, * * @param n_entries The number of actions in the array. * - * @param display_items A pointer to an array of GncDisplayItem. - * - * @param n_display_items The number of display items in the array. - * * @param filename The filename containing the user interface * definition that goes with this set of actions. * @@ -257,8 +244,6 @@ void gnc_main_window_merge_actions (GncMainWindow *window, const gchar *group_name, GActionEntry *entries, guint n_entries, - GncDisplayItem *display_items, - guint n_display_items, const gchar **ui_updates, const gchar *ui_filename, gpointer user_data); diff --git a/gnucash/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c index a85aff94b8..327bceb029 100644 --- a/gnucash/gnome-utils/gnc-plugin.c +++ b/gnucash/gnome-utils/gnc-plugin.c @@ -147,7 +147,6 @@ gnc_plugin_add_to_window (GncPlugin *plugin, klass->actions_name, klass->n_actions, klass->ui_filename); gnc_main_window_merge_actions (window, klass->actions_name, klass->actions, klass->n_actions, - klass->display_items, klass->n_display_items, klass->ui_updates, klass->ui_filename, plugin); } diff --git a/gnucash/gnome-utils/gnc-plugin.h b/gnucash/gnome-utils/gnc-plugin.h index d0a1281f46..9ab2ccee25 100644 --- a/gnucash/gnome-utils/gnc-plugin.h +++ b/gnucash/gnome-utils/gnc-plugin.h @@ -123,11 +123,6 @@ typedef struct /** The number of actions in the actions array. */ guint n_actions; //FIXMEb added - /** An array of display items (menu / toolbar entries) */ - GncDisplayItem *display_items; //FIXMEb added - /** The number of display_items in the display item array. */ - guint n_display_items; //FIXMEb added - /** An array of ui updates for the menu model */ const gchar **ui_updates; //FIXMEb added diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c index 5ebe80882f..d2486c4ebd 100644 --- a/gnucash/gnome/gnc-plugin-page-account-tree.c +++ b/gnucash/gnome/gnc-plugin-page-account-tree.c @@ -213,108 +213,6 @@ static GActionEntry gnc_plugin_page_account_tree_actions [] = /** The number of actions provided by this plugin. */ static guint gnc_plugin_page_account_tree_n_actions = G_N_ELEMENTS(gnc_plugin_page_account_tree_actions); -static GncDisplayItem gnc_plugin_page_account_tree_display_items [] = -{ - /* File menu */ - { - "FileNewAccountAction", GNC_ICON_NEW_ACCOUNT, N_("New _Account..."), NULL, - N_("Create a new Account") - }, - { - "FileAddAccountHierarchyAssistantAction", GNC_ICON_NEW_ACCOUNT, N_("New Account _Hierarchy..."), NULL, - N_("Extend the current book by merging with new account type categories") - }, - { - "EditOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, - N_("Open the selected account") - }, - { - "EditOpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, - N_("Open the selected account and all its subaccounts") - }, - /* Edit menu */ - { - "EditEditAccountAction", GNC_ICON_EDIT_ACCOUNT, N_("Edit _Account"), "e", - N_("Edit the selected account") - }, - { - "EditDeleteAccountAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete Account..."), "Delete", - N_("Delete selected account") - }, - { - "EditCascadeAccountAction", NULL, N_("_Cascade Account Properties..."), NULL, - N_("Cascade selected properties for account") - }, - { - "EditFindAccountAction", "edit-find", N_("F_ind Account"), "i", - N_("Find an account") - }, - { - "EditFindAccountPopupAction", "edit-find", N_("F_ind Account"), "i", - N_("Find an account") - }, - { - "EditRenumberSubaccountsAction", NULL, N_("_Renumber Subaccounts..."), NULL, - N_("Renumber the children of the selected account") - }, - { - "EditTaxOptionsAction", NULL, - /* Translators: remember to reuse this - translation in dialog-account.glade */ - N_("Ta_x Report Options"), NULL, - /* Translators: currently implemented are - US: income tax and - DE: VAT - So adjust this string */ - N_("Setup relevant accounts for tax reports, e.g. US income tax") - }, - /* View menu */ - { - "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL - }, - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, - /* Actions menu */ - { - "ActionsReconcileAction", NULL, N_("_Reconcile..."), NULL, - N_("Reconcile the selected account") - }, - { - "ActionsAutoClearAction", NULL, N_("_Auto-clear..."), NULL, - N_("Automatically clear individual transactions, given a cleared amount") - }, - { - "ActionsTransferAction", NULL, N_("_Transfer..."), "t", - N_("Transfer funds from one account to another") - }, - { - "ActionsStockSplitAction", NULL, N_("Stoc_k Split..."), NULL, - N_("Record a stock split or a stock merger") - }, - { - "ActionsLotsAction", NULL, N_("View _Lots..."), NULL, - N_("Bring up the lot viewer/editor window") - }, - { - "ScrubAction", NULL, N_("Check & Repair A_ccount"), NULL, - N_("Check for and repair unbalanced transactions and orphan splits " "in this account") - }, - { - "ScrubSubAction", NULL, N_("Check & Repair Su_baccounts"), NULL, - N_("Check for and repair unbalanced transactions and orphan splits " - "in this account and its subaccounts") - }, - { - "ScrubAllAction", NULL, N_("Check & Repair A_ll"), NULL, - N_("Check for and repair unbalanced transactions and orphan splits " "in all accounts") - }, -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_account_tree_n_display_items = G_N_ELEMENTS(gnc_plugin_page_account_tree_display_items); - - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c index 0f87144018..b1f51cadce 100644 --- a/gnucash/gnome/gnc-plugin-page-budget.c +++ b/gnucash/gnome/gnc-plugin-page-budget.c @@ -142,59 +142,6 @@ static GActionEntry gnc_plugin_page_budget_actions [] = }; static guint gnc_plugin_page_budget_n_actions = G_N_ELEMENTS(gnc_plugin_page_budget_actions); -static GncDisplayItem gnc_plugin_page_budget_display_items [] = -{ - /* File menu */ - { - "OpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, - N_("Open the selected account.") - }, - { - "OpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, - N_("Open _Subaccounts"), NULL, - N_("Open the selected account and all its subaccounts.") - }, - /* Edit menu */ - { - "DeleteBudgetAction", GNC_ICON_DELETE_BUDGET, N_("_Delete Budget..."), - NULL, N_("Select this or another budget and delete it.") - }, - { - "OptionsBudgetAction", "document-properties", N_("Budget _Options..."), - NULL, N_("Edit this budget's options.") - }, - { - "EstimateBudgetAction", "system-run", N_("Esti_mate Budget..."), - NULL, - N_("Estimate a budget value for the selected accounts from past transactions.") - }, - { - "AllPeriodsBudgetAction", "system-run", N_("_All Periods..."), - NULL, - N_("Edit budget for all periods for the selected accounts.") - }, - { - "BudgetNoteAction", "text-x-generic", N_("Edit Note"), - NULL, - N_("Edit note for the selected account and period.") - }, - { - "BudgetReportAction", "system-run", N_("Budget Report"), - NULL, - N_("Run the budget report.") - }, - /* View menu */ - { - "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL - }, - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window.") - }, -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_budget_n_display_items = G_N_ELEMENTS(gnc_plugin_page_budget_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index 22752a3a15..50245a310e 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -139,115 +139,6 @@ static GActionEntry gnc_plugin_page_invoice_actions [] = }; static guint gnc_plugin_page_invoice_n_actions = G_N_ELEMENTS(gnc_plugin_page_invoice_actions); -static GncDisplayItem gnc_plugin_page_invoice_display_items [] = -{ - { "SortOrderAction", NULL, N_("Sort _Order"), NULL, NULL }, - /* File menu */ - { - "FileNewAccountAction", GNC_ICON_NEW_ACCOUNT, N_("New _Account..."), NULL, - N_("Create a new account") - }, - { - "FilePrintAction", "document-print", N_("_Print Invoice"), "p", - N_("Make a printable invoice") - }, - /* Edit menu */ - { - "EditCutAction", "edit-cut", N_("_Cut"), "X", - NULL - }, - { - "EditCopyAction", "edit-copy", N_("Copy"), "C", - NULL - }, - { - "EditPasteAction", "edit-paste", N_("_Paste"), "V", - NULL - }, - { - "EditEditInvoiceAction", GNC_ICON_INVOICE_EDIT, "_Edit Invoice", NULL, - "Edit this invoice" - }, - { - "EditDuplicateInvoiceAction", GNC_ICON_INVOICE_DUPLICATE, "_Duplicate Invoice", - NULL, "Create a new invoice as a duplicate of the current one" - }, - { - "EditPostInvoiceAction", GNC_ICON_INVOICE_POST, "_Post Invoice", NULL, - "Post this invoice to your Chart of Accounts" - }, - { - "EditUnpostInvoiceAction", GNC_ICON_INVOICE_UNPOST, "_Unpost Invoice", NULL, - "Unpost this invoice and make it editable" - }, - /* View menu */ - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, - { - "ViewSaveLayoutAction", NULL, "_Use as Default Layout for Customer Documents", NULL, - "Use the current layout as default for all customer invoices and credit notes" - }, - { - "ViewResetLayoutAction", NULL, "_Reset Default Layout for Customer Documents", NULL, - "Reset default layout for all customer invoices and credit notes back to built-in defaults and update the current page accordingly" - }, - /* Actions menu */ - { - "RecordEntryAction", "list-add", N_("_Enter"), NULL, - N_("Record the current entry") - }, - { - "CancelEntryAction", "process-stop", N_("_Cancel"), NULL, - N_("Cancel the current entry") - }, - { - "DeleteEntryAction", "edit-delete", N_("_Delete"), NULL, - N_("Delete the current entry") - }, - { - "BlankEntryAction", "go-bottom", N_("_Blank"), NULL, - "Move to the blank entry at the bottom of the Invoice" - }, - { - "DuplicateEntryAction", "edit-copy", N_("Dup_licate Entry"), NULL, - N_("Make a copy of the current entry") - }, - { - "EntryUpAction", "pan-up-symbolic", N_("Move Entry _Up"), NULL, - N_("Move the current entry one row upwards") - }, - { - "EntryDownAction", "pan-down-symbolic", N_("Move Entry Do_wn"), NULL, - N_("Move the current entry one row downwards") - }, - /* Business menu */ - { - "BusinessNewInvoiceAction", GNC_ICON_INVOICE_NEW, "New _Invoice", "", - "Create a new invoice for the same owner as the current one" - }, - { - "BusinessLinkAction", NULL, "_Manage Document Link...", NULL, - "Manage link of an external document to this item." - }, - { - "BusinessLinkOpenAction", NULL, "_Open Linked Document", NULL, - "Open the linked document" - }, - { - "ToolsProcessPaymentAction", GNC_ICON_INVOICE_PAY, "_Pay Invoice", NULL, - "Enter a payment for the owner of this invoice" - }, - /* Reports menu */ - { - "ReportsCompanyReportAction", NULL, N_("_Company Report"), NULL, - "Open a company report window for the owner of this invoice" - }, -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_invoice_n_display_items = G_N_ELEMENTS(gnc_plugin_page_invoice_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c index cdcd8d9d84..2598c84cbb 100644 --- a/gnucash/gnome/gnc-plugin-page-owner-tree.c +++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c @@ -167,90 +167,6 @@ static GActionEntry gnc_plugin_page_owner_tree_actions [] = /** The number of actions provided by this plugin. */ static guint gnc_plugin_page_owner_tree_n_actions = G_N_ELEMENTS(gnc_plugin_page_owner_tree_actions); -static GncDisplayItem gnc_plugin_page_owner_tree_display_items [] = -{ - /* Edit menu */ - { - "OTEditVendorAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Vendor"), "e", - N_("Edit the selected vendor") - }, - { - "OTEditCustomerAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Customer"), "e", - N_("Edit the selected customer") - }, - { - "OTEditEmployeeAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Employee"), "e", - N_("Edit the selected employee") - }, - { - "OTNewVendorAction", GNC_ICON_NEW_ACCOUNT, N_("_New Vendor..."), NULL, - N_("Create a new vendor") - }, - { - "OTNewCustomerAction", GNC_ICON_NEW_ACCOUNT, N_("_New Customer..."), NULL, - N_("Create a new customer") - }, - { - "OTNewEmployeeAction", GNC_ICON_NEW_ACCOUNT, N_("_New Employee..."), NULL, - N_("Create a new employee") - }, -#if 0 /* Disabled due to crash */ - { - "EditDeleteOwnerAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete Owner..."), "Delete", - N_("Delete selected owner") - }, -#endif /* Disabled due to crash */ - - /* View menu */ - { - "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL - }, - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, - - /* Business menu */ - { - "OTNewBillAction", GNC_ICON_INVOICE_NEW, N_("New _Bill..."), NULL, - N_("Create a new bill") - }, - { - "OTNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice..."), NULL, - N_("Create a new invoice") - }, - { - "OTNewVoucherAction", GNC_ICON_INVOICE_NEW, N_("New _Voucher..."), NULL, - N_("Create a new voucher") - }, - { - "OTVendorListingReportAction", "document-print-preview", N_("Vendor Listing"), NULL, - N_("Show vendor aging overview for all vendors") - }, - { - "OTCustomerListingReportAction", "document-print-preview", N_("Customer Listing"), NULL, - N_("Show customer aging overview for all customers") - }, - { - "OTVendorReportAction", NULL, N_("Vendor Report"), NULL, - N_("Show vendor report") - }, - { - "OTCustomerReportAction", NULL, N_("Customer Report"), NULL, - N_("Show customer report") - }, - { - "OTEmployeeReportAction", NULL, N_("Employee Report"), NULL, - N_("Show employee report") - }, - { - "OTProcessPaymentAction", GNC_ICON_INVOICE_PAY, - N_("Process Payment"), NULL, N_("Process Payment") - }, - }; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_owner_tree_n_display_items = G_N_ELEMENTS(gnc_plugin_page_owner_tree_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index d8f08f913a..f9eef0323d 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -348,206 +348,6 @@ static GActionEntry gnc_plugin_page_register_actions [] = }; static guint gnc_plugin_page_register_n_actions = G_N_ELEMENTS(gnc_plugin_page_register_actions); -static GncDisplayItem gnc_plugin_page_register_display_items [] = -{ - /* File menu */ - { - "FilePrintAction", "document-print", N_ ("_Print Checks..."), "p", NULL - }, - /* Edit menu */ - { - "EditCutAction", "edit-cut", N_ ("Cu_t"), "X", - N_ ("Cut the current selection and copy it to clipboard") - }, - { - "EditCopyAction", "edit-copy", N_ ("_Copy"), "C", - N_ ("Copy the current selection to clipboard") - }, - { - "EditPasteAction", "edit-paste", N_ ("_Paste"), "V", - N_ ("Paste the clipboard content at the cursor position") - }, - { - "EditEditAccountAction", GNC_ICON_EDIT_ACCOUNT, N_ ("Edit _Account"), "e", - N_ ("Edit the selected account") - }, - { - "EditFindAccountAction", "edit-find", N_ ("F_ind Account"), "i", - N_ ("Find an account") - }, - { - "EditFindTransactionsAction", "edit-find", N_ ("_Find..."), "f", - N_ ("Find transactions with a search") - }, - { - "EditTaxOptionsAction", NULL, - /* Translators: remember to reuse this - translation in dialog-account.glade */ - N_("Ta_x Report Options"), NULL, - /* Translators: currently implemented are - US: income tax and - DE: VAT - So adjust this string */ - N_("Setup relevant accounts for tax reports, e.g. US income tax") - }, - /* Transaction menu */ - { - "CutTransactionAction", "edit-cut", CUT_TRANSACTION_LABEL, "", - CUT_TRANSACTION_TIP - }, - { - "CopyTransactionAction", "edit-copy", COPY_TRANSACTION_LABEL, "", - COPY_TRANSACTION_TIP - }, - { - "PasteTransactionAction", "edit-paste", PASTE_TRANSACTION_LABEL, "", - PASTE_TRANSACTION_TIP - }, - { - "DuplicateTransactionAction", "edit-copy", DUPLICATE_TRANSACTION_LABEL, "", - DUPLICATE_TRANSACTION_TIP - }, - { - "DeleteTransactionAction", "edit-delete", DELETE_TRANSACTION_LABEL, NULL, - DELETE_TRANSACTION_TIP - }, - { - "RemoveTransactionSplitsAction", "edit-clear", N_ ("Remo_ve Other Splits"), NULL, - N_ ("Remove all splits in the current transaction") - }, - { - "RecordTransactionAction", "list-add", N_ ("_Enter Transaction"), NULL, - N_ ("Record the current transaction") - }, - { - "CancelTransactionAction", "process-stop", N_ ("Ca_ncel Transaction"), NULL, - N_ ("Cancel the current transaction") - }, - { - "VoidTransactionAction", NULL, N_ ("_Void Transaction"), NULL, NULL - }, - { - "UnvoidTransactionAction", NULL, N_ ("_Unvoid Transaction"), NULL, NULL - }, - { - "ReverseTransactionAction", NULL, N_ ("Add _Reversing Transaction"), NULL, NULL - }, - { - "LinkTransactionAction", NULL, LINK_TRANSACTION_LABEL, NULL, - LINK_TRANSACTION_TIP - }, - { - "LinkedTransactionOpenAction", NULL, LINK_TRANSACTION_OPEN_LABEL, NULL, - LINK_TRANSACTION_OPEN_TIP - }, - { - "JumpLinkedInvoiceAction", NULL, JUMP_LINKED_INVOICE_LABEL, NULL, - JUMP_LINKED_INVOICE_TIP - }, - /* View menu */ - { - "ViewSortByAction", NULL, N_ ("_Sort By..."), NULL, NULL - }, - { - "ViewFilterByAction", NULL, N_ ("_Filter By..."), NULL, NULL - }, - { - "ViewRefreshAction", "view-refresh", N_ ("_Refresh"), "r", - N_ ("Refresh this window") - }, - /* Actions menu */ - { - "ActionsTransferAction", GNC_ICON_TRANSFER, N_ ("_Transfer..."), "t", - N_ ("Transfer funds from one account to another") - }, - { - "ActionsReconcileAction", "edit-select-all", N_ ("_Reconcile..."), NULL, - N_ ("Reconcile the selected account") - }, - { - "ActionsAutoClearAction", "edit-select-all", N_ ("_Auto-clear..."), NULL, - N_ ("Automatically clear individual transactions, so as to reach a certain cleared amount") - }, - { - "ActionsStockAssistantAction", "applications-utilities", - N_ ("Stock Ass_istant"), NULL, N_ ("Stock Assistant") - }, - { - "ActionsStockSplitAction", NULL, N_ ("Stoc_k Split..."), NULL, - N_ ("Record a stock split or a stock merger") - }, - { - "ActionsLotsAction", NULL, N_ ("View _Lots..."), NULL, - N_ ("Bring up the lot viewer/editor window") - }, - { - "BlankTransactionAction", "go-bottom", N_ ("_Blank Transaction"), "Page_Down", - N_ ("Move to the blank transaction at the bottom of the register") - }, - { - "GotoDateAction", "x-office-calendar", N_ ("_Go to Date"), "G", - N_ ("Move to the split at the specified date") - }, - { - "EditExchangeRateAction", NULL, N_ ("Edit E_xchange Rate"), NULL, - N_ ("Edit the exchange rate for the current transaction") - }, - { -/* Translators: This is a menu item that will open a register tab for the - account of the first other account in the current transaction's split list - with focus on the current transaction's entry in that register. */ - "JumpTransactionAction", GNC_ICON_JUMP_TO, N_ ("_Jump to the other account"), NULL, - N_ ("Open a new register tab for the other account with focus on this transaction.") - }, - { - "ScheduleTransactionAction", GNC_ICON_SCHEDULE, N_ ("Sche_dule..."), NULL, - N_ ("Create a Scheduled Transaction with the current transaction as a template") - }, - { - "ScrubAllAction", NULL, - /* Translators: The following 2 are Scrub actions in register view */ - N_ ("_All transactions"), NULL, NULL - }, - { - "ScrubCurrentAction", NULL, N_ ("_This transaction"), NULL, NULL - }, - /* Reports menu */ - { - "ReportsAccountReportAction", NULL, N_ ("Account Report"), NULL, - N_ ("Open a register report for this Account") - }, - { - "ReportsAcctTransReportAction", NULL, N_ ("Account Report - Single Transaction"), NULL, - N_ ("Open a register report for the selected Transaction") - }, - /* Toggles and radio */ - { - "ViewStyleDoubleLineAction", NULL, N_ ("_Double Line"), NULL, - N_ ("Show a second line with \"Action\", \"Notes\", and \"Linked Document\" for each transaction.") - }, - { - "SplitTransactionAction", GNC_ICON_SPLIT_TRANS, N_ ("S_plit Transaction"), NULL, - N_ ("Show all splits in the current transaction") - }, - /* Translators: This is a menu item in the View menu */ - { - "ViewStyleBasicAction", NULL, N_ ("_Basic Ledger"), NULL, - N_ ("Show transactions on one or two lines") - }, - /* Translators: This is a menu item in the View menu */ - { - "ViewStyleAutoSplitAction", NULL, N_ ("_Auto-Split Ledger"), NULL, - N_ ("Show transactions on one or two lines and expand the current transaction") - }, - /* Translators: This is a menu item in the View menu */ - { - "ViewStyleJournalAction", NULL, N_ ("Transaction _Journal"), NULL, - N_ ("Show expanded transactions with all splits") - } -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_register_n_display_items = G_N_ELEMENTS(gnc_plugin_page_register_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-report.cpp b/gnucash/gnome/gnc-plugin-page-report.cpp index 113c065645..a246c61405 100644 --- a/gnucash/gnome/gnc-plugin-page-report.cpp +++ b/gnucash/gnome/gnc-plugin-page-report.cpp @@ -209,68 +209,6 @@ static GActionEntry report_actions[] = }; static guint num_report_actions = G_N_ELEMENTS(report_actions); -static GncDisplayItem report_display_items [] = -{ - { - "FilePrintAction", "document-print", N_("_Print Report..."), "p", - N_("Print the current report") - }, - { - "FilePrintPDFAction", GNC_ICON_PDF_EXPORT, N_("Export as P_DF..."), nullptr, - N_("Export the current report as a PDF document") - }, - { - "EditCutAction", "edit-cut", N_("Cu_t"), "X", - N_("Cut the current selection and copy it to clipboard") - }, - { - "EditCopyAction", "edit-copy", N_("_Copy"), "C", - N_("Copy the current selection to clipboard") - }, - { - "EditPasteAction", "edit-paste", N_("_Paste"), "V", - N_("Paste the clipboard content at the cursor position") - }, - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, - { - "ReportSaveAction", "document-save", N_("Save _Report Configuration"), "s", - nullptr - }, - { - "ReportSaveAsAction", "document-save-as", N_("Save Report Configuration As..."), "s", - nullptr - }, - { - "ReportExportAction", "go-next", N_("Export _Report"), nullptr, - N_("Export HTML-formatted report to file") - }, - { - "ReportOptionsAction", "document-properties", N_("_Report Options"), nullptr, - N_("Edit report options") - }, - { - "ReportBackAction", "go-previous", N_("Back"), nullptr, - N_("Move back one step in the history") - }, - { - "ReportForwAction", "go-next", N_("Forward"), nullptr, - N_("Move forward one step in the history") - }, - { - "ReportReloadAction", "view-refresh", N_("Reload"), nullptr, - N_("Reload the current page") - }, - { - "ReportStopAction", "process-stop", N_("Stop"), nullptr, - N_("Cancel outstanding HTML requests") - }, -}; -/** The number of display items provided by this plugin. */ -static guint report_n_display_items = G_N_ELEMENTS(report_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c index 55f2b6b40e..d8ebff4e97 100644 --- a/gnucash/gnome/gnc-plugin-page-sx-list.c +++ b/gnucash/gnome/gnc-plugin-page-sx-list.c @@ -139,30 +139,6 @@ static GActionEntry gnc_plugin_page_sx_list_actions [] = /** The number of actions provided by this plugin. */ static guint gnc_plugin_page_sx_list_n_actions = G_N_ELEMENTS(gnc_plugin_page_sx_list_actions); -static GncDisplayItem gnc_plugin_page_sx_list_display_items [] = -{ - { "SxListAction", NULL, N_("_Scheduled"), NULL, NULL }, - { - "SxListNewAction", GNC_ICON_NEW_ACCOUNT, N_("_New"), NULL, - N_("Create a new scheduled transaction") - }, - { - "SxListEditAction", GNC_ICON_EDIT_ACCOUNT, N_("_Edit"), NULL, - N_("Edit the selected scheduled transaction") - }, - { - "SxListDeleteAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete"), NULL, - N_("Delete the selected scheduled transaction") - }, - /* View menu */ - { - "ViewRefreshAction", "view-refresh", N_("_Refresh"), "r", - N_("Refresh this window") - }, -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_page_sx_list_n_display_items = G_N_ELEMENTS(gnc_plugin_page_sx_list_display_items); - /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { diff --git a/gnucash/ui/gnc-plugin-page-register.ui b/gnucash/ui/gnc-plugin-page-register.ui index 744ba60389..045acde234 100644 --- a/gnucash/ui/gnc-plugin-page-register.ui +++ b/gnucash/ui/gnc-plugin-page-register.ui @@ -58,6 +58,7 @@ + _Basic Ledger GncPluginPageRegisterActions.ViewStyleRadioAction 0 @@ -65,6 +66,7 @@ yes + _Auto-Split Ledger GncPluginPageRegisterActions.ViewStyleRadioAction 1 @@ -72,6 +74,7 @@ yes + Transaction _Journal GncPluginPageRegisterActions.ViewStyleRadioAction 2 @@ -286,6 +289,9 @@ yes + _Jump to the other account GncPluginPageRegisterActions.JumpTransactionAction Open a new register tab for the other account with focus on this transaction @@ -295,6 +301,7 @@ + _Check & Repair mainwin.ScrubMenuAction yes diff --git a/libgnucash/gnc-module/example/gnc-plugin.example.c b/libgnucash/gnc-module/example/gnc-plugin.example.c index 491b305e8f..b55899d17c 100644 --- a/libgnucash/gnc-module/example/gnc-plugin.example.c +++ b/libgnucash/gnc-module/example/gnc-plugin.example.c @@ -53,16 +53,6 @@ static GActionEntry gnc_plugin_actions [] = /** The number of actions provided by this plugin. */ static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions); -static GncDisplayItem gnc_plugin_display_items [] = -{ - /* Menu Items */ - { "exampleAction", NULL, N_("example description..."), NULL, - N_("example tooltip") - }, -}; -/** The number of display items provided by this plugin. */ -static guint gnc_plugin_n_display_items = G_N_ELEMENTS(gnc_plugin_display_items); - /************************************************************ * Object Implementation * ************************************************************/ @@ -90,8 +80,6 @@ gnc_plugin_example_class_init (GncPluginexampleClass *klass) plugin_class->actions_name = PLUGIN_ACTIONS_NAME; plugin_class->actions = gnc_plugin_actions; plugin_class->n_actions = gnc_plugin_n_actions; - plugin_class->display_items = gnc_plugin_display_items; - plugin_class->n_display_items = gnc_plugin_n_display_items; plugin_class->ui_filename = PLUGIN_UI_FILENAME; }