diff --git a/gnucash/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c index 558f5e5e5b..39d74631a0 100644 --- a/gnucash/gnome-utils/gnc-plugin-file-history.c +++ b/gnucash/gnome-utils/gnc-plugin-file-history.c @@ -100,7 +100,7 @@ static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions); /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { - "FilePlaceholder5", + "FilePlaceholder6", NULL, }; @@ -432,7 +432,7 @@ gnc_history_update_action (GncMainWindow *window, if (!gnc_menubar_model_find_item (gnc_main_window_get_menu_model(window), gsm)) // could not find action_name { add_item = TRUE; - gsm->search_action_name = "FilePlaceholder5"; // placeholder + gsm->search_action_name = "FilePlaceholder6"; // placeholder if (!gnc_menubar_model_find_item (gnc_main_window_get_menu_model(window), gsm)) { diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c index c3b8749276..610bd7da60 100644 --- a/gnucash/gnome/gnc-plugin-basic-commands.c +++ b/gnucash/gnome/gnc-plugin-basic-commands.c @@ -136,7 +136,9 @@ static const gchar *gnc_plugin_load_ui_items [] = { "FilePlaceholder0", "FilePlaceholder2", - "FilePlaceholder4", + "FilePlaceholder3", + "FilePlaceholder5", + "EditPlaceholder3", "EditPlaceholder5", "ActionsPlaceholder2", "ToolsPlaceholder1", diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c index e3ae5ec897..1793216f4a 100644 --- a/gnucash/gnome/gnc-plugin-page-account-tree.c +++ b/gnucash/gnome/gnc-plugin-page-account-tree.c @@ -216,6 +216,7 @@ static guint gnc_plugin_page_account_tree_n_actions = G_N_ELEMENTS(gnc_plugin_pa /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder1", "EditPlaceholder2", "EditPlaceholder3", diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c index 1996ff45b4..ff754f8f47 100644 --- a/gnucash/gnome/gnc-plugin-page-budget.c +++ b/gnucash/gnome/gnc-plugin-page-budget.c @@ -127,7 +127,6 @@ static void allperiods_budget_helper (GtkTreeModel *model, GtkTreePath *path, static GActionEntry gnc_plugin_page_budget_actions [] = { - { "FakeToplevel", NULL, NULL, NULL, NULL }, { "OpenAccountAction", gnc_plugin_page_budget_cmd_open_account, NULL, NULL, NULL }, { "OpenSubaccountsAction", gnc_plugin_page_budget_cmd_open_subaccounts, NULL, NULL, NULL }, { "DeleteBudgetAction", gnc_plugin_page_budget_cmd_delete_budget, NULL, NULL, NULL }, @@ -145,6 +144,7 @@ static guint gnc_plugin_page_budget_n_actions = G_N_ELEMENTS(gnc_plugin_page_bud /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder1", "EditPlaceholder3", "EditPlaceholder5", @@ -384,6 +384,9 @@ gnc_plugin_page_budget_focus_widget (GncPluginPage *budget_plugin_page) /* Disable the Schedule menu */ action = gnc_main_window_find_action (GNC_MAIN_WINDOW(budget_plugin_page->window), "ScheduledAction"); g_simple_action_set_enabled (G_SIMPLE_ACTION(action), FALSE); + /* Disable the FilePrintAction */ + action = gnc_main_window_find_action (GNC_MAIN_WINDOW(budget_plugin_page->window), "FilePrintAction"); + g_simple_action_set_enabled (G_SIMPLE_ACTION(action), FALSE); gnc_main_window_update_menu_and_toolbar (GNC_MAIN_WINDOW(budget_plugin_page->window), budget_plugin_page, diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index 416337d528..62ee94b512 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -143,6 +143,7 @@ static guint gnc_plugin_page_invoice_n_actions = G_N_ELEMENTS(gnc_plugin_page_in /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder1", "EditPlaceholder3", "EditPlaceholder5", diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c index 5ed950ab1b..fea6c5d98e 100644 --- a/gnucash/gnome/gnc-plugin-page-owner-tree.c +++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c @@ -170,6 +170,7 @@ static guint gnc_plugin_page_owner_tree_n_actions = G_N_ELEMENTS(gnc_plugin_page /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder2", "EditPlaceholder3", "EditPlaceholder5", diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index 6335a5231b..78fd5a8a11 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -351,6 +351,7 @@ static guint gnc_plugin_page_register_n_actions = G_N_ELEMENTS(gnc_plugin_page_r /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder1", "EditPlaceholder2", "EditPlaceholder3", diff --git a/gnucash/gnome/gnc-plugin-page-report.cpp b/gnucash/gnome/gnc-plugin-page-report.cpp index 11c20d45da..13e5efa4c6 100644 --- a/gnucash/gnome/gnc-plugin-page-report.cpp +++ b/gnucash/gnome/gnc-plugin-page-report.cpp @@ -215,6 +215,7 @@ static const gchar *gnc_plugin_load_ui_items [] = { "FilePlaceholder3", "FilePlaceholder4", + "FilePlaceholder5", "EditPlaceholder6", "ReportsPlaceholder1", NULL, diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c index e57df8ae09..d80b87cb3e 100644 --- a/gnucash/gnome/gnc-plugin-page-sx-list.c +++ b/gnucash/gnome/gnc-plugin-page-sx-list.c @@ -142,6 +142,7 @@ static guint gnc_plugin_page_sx_list_n_actions = G_N_ELEMENTS(gnc_plugin_page_sx /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { + "FilePlaceholder3", "EditPlaceholder3", "EditPlaceholder5", "ViewPlaceholder4", @@ -183,6 +184,9 @@ gnc_plugin_page_sx_list_focus_widget (GncPluginPage *sx_plugin_page) /* Enable the Schedule Menu */ action = gnc_main_window_find_action (GNC_MAIN_WINDOW(sx_plugin_page->window), "ScheduledAction"); g_simple_action_set_enabled (G_SIMPLE_ACTION(action), TRUE); + /* Disable the FilePrintAction */ + action = gnc_main_window_find_action (GNC_MAIN_WINDOW(sx_plugin_page->window), "FilePrintAction"); + g_simple_action_set_enabled (G_SIMPLE_ACTION(action), FALSE); gnc_main_window_update_menu_and_toolbar (GNC_MAIN_WINDOW(sx_plugin_page->window), sx_plugin_page, diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c index 37e83566f8..0e41ba7b69 100644 --- a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c +++ b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c @@ -57,7 +57,7 @@ static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions); /** The default menu items that need to be add to the menu */ static const gchar *gnc_plugin_load_ui_items [] = { - "FilePlaceholder4", + "FilePlaceholder5", NULL, }; diff --git a/gnucash/ui/gnc-main-window.ui b/gnucash/ui/gnc-main-window.ui index a9bbf7487c..13f5a04145 100644 --- a/gnucash/ui/gnc-main-window.ui +++ b/gnucash/ui/gnc-main-window.ui @@ -32,10 +32,9 @@
- _Print - mainwin.FilePrintAction - <Primary>p - Print the currently active page + PrintPlaceholder + mainwin.FilePlaceholder3 + action-disabled Pa_ge Setup... @@ -45,7 +44,7 @@ PdfPlaceholder - mainwin.FilePlaceholder3 + mainwin.FilePlaceholder4 action-disabled @@ -53,7 +52,7 @@ mainwin.FileExportAction ExportPlaceholder - mainwin.FilePlaceholder4 + mainwin.FilePlaceholder5 action-disabled @@ -69,7 +68,7 @@
RecentPlaceholder - mainwin.FilePlaceholder5 + mainwin.FilePlaceholder6 action-disabled
diff --git a/gnucash/ui/gnc-plugin-basic-commands.ui b/gnucash/ui/gnc-plugin-basic-commands.ui index ad4648893a..250957fd2d 100644 --- a/gnucash/ui/gnc-plugin-basic-commands.ui +++ b/gnucash/ui/gnc-plugin-basic-commands.ui @@ -36,7 +36,17 @@ - + + + _Print + mainwin.FilePrintAction + <Primary>p + Print the currently active page + yes + + + + Export _Accounts gnc-plugin-basic-commands-actions.FileExportAccountsAction @@ -44,6 +54,16 @@ + + + _Find... + gnc-plugin-basic-commands-actions.EditFindTransactionsAction + <Primary>f + Find transactions with a search + yes + + + diff --git a/gnucash/ui/gnc-plugin-csv-export.ui b/gnucash/ui/gnc-plugin-csv-export.ui index c827d3c760..cf0d102c31 100644 --- a/gnucash/ui/gnc-plugin-csv-export.ui +++ b/gnucash/ui/gnc-plugin-csv-export.ui @@ -1,7 +1,7 @@ - + Export Account T_ree to CSV... gnc-plugin-csv-export-actions.CsvExportTreeAction diff --git a/gnucash/ui/gnc-plugin-file-history.ui b/gnucash/ui/gnc-plugin-file-history.ui index c944bd6a04..14b9293743 100644 --- a/gnucash/ui/gnc-plugin-file-history.ui +++ b/gnucash/ui/gnc-plugin-file-history.ui @@ -1,7 +1,7 @@ - + RecentFile0Action gnc-plugin-file-history-actions.RecentFile0Action diff --git a/gnucash/ui/gnc-plugin-page-account-tree.ui b/gnucash/ui/gnc-plugin-page-account-tree.ui index b449ce79d8..aea226eec3 100644 --- a/gnucash/ui/gnc-plugin-page-account-tree.ui +++ b/gnucash/ui/gnc-plugin-page-account-tree.ui @@ -1,6 +1,16 @@ + + + _Print + mainwin.FilePrintAction + <Primary>p + Print the currently active page + yes + + + _Edit Account diff --git a/gnucash/ui/gnc-plugin-page-budget.ui b/gnucash/ui/gnc-plugin-page-budget.ui index a187e2f2d6..b2b14db74f 100644 --- a/gnucash/ui/gnc-plugin-page-budget.ui +++ b/gnucash/ui/gnc-plugin-page-budget.ui @@ -1,6 +1,16 @@ + + + _Print + mainwin.FilePrintAction + <Primary>p + Print the currently active page + yes + + + Esti_mate Budget... diff --git a/gnucash/ui/gnc-plugin-page-invoice.ui b/gnucash/ui/gnc-plugin-page-invoice.ui index 5048d76efd..3baed0ee8e 100644 --- a/gnucash/ui/gnc-plugin-page-invoice.ui +++ b/gnucash/ui/gnc-plugin-page-invoice.ui @@ -1,6 +1,16 @@ + + + _Print + GncPluginPageInvoiceActions.FilePrintAction + <Primary>p + Print the currently active page + yes + + + EditEditInvoiceAction diff --git a/gnucash/ui/gnc-plugin-page-owner-tree.ui b/gnucash/ui/gnc-plugin-page-owner-tree.ui index 743f94055d..b57a0445e2 100644 --- a/gnucash/ui/gnc-plugin-page-owner-tree.ui +++ b/gnucash/ui/gnc-plugin-page-owner-tree.ui @@ -1,6 +1,16 @@ + + + _Print + mainwin.FilePrintAction + <Primary>p + Print the currently active page + yes + + + E_dit Customer diff --git a/gnucash/ui/gnc-plugin-page-register.ui b/gnucash/ui/gnc-plugin-page-register.ui index 045acde234..5550cd5bc7 100644 --- a/gnucash/ui/gnc-plugin-page-register.ui +++ b/gnucash/ui/gnc-plugin-page-register.ui @@ -1,6 +1,15 @@ + + + _Print Cheques + GncPluginPageRegisterActions.FilePrintAction + <Primary>p + yes + + + Assign as payment... diff --git a/gnucash/ui/gnc-plugin-page-report.ui b/gnucash/ui/gnc-plugin-page-report.ui index 6cf2bb68ca..742d944d85 100644 --- a/gnucash/ui/gnc-plugin-page-report.ui +++ b/gnucash/ui/gnc-plugin-page-report.ui @@ -1,6 +1,16 @@ + + + _Print Report + GncPluginPageReportActions.FilePrintAction + <Primary>p + Print the current report + yes + + + _Report Options @@ -10,7 +20,7 @@ - + Export as P_DF... GncPluginPageReportActions.FilePrintPDFAction @@ -19,7 +29,7 @@ - + Export _Report GncPluginPageReportActions.ReportExportAction diff --git a/gnucash/ui/gnc-plugin-page-sx-list.ui b/gnucash/ui/gnc-plugin-page-sx-list.ui index 5ff5a5a912..1ce4863f1d 100644 --- a/gnucash/ui/gnc-plugin-page-sx-list.ui +++ b/gnucash/ui/gnc-plugin-page-sx-list.ui @@ -1,6 +1,16 @@ + + + _Print + mainwin.FilePrintAction + <Primary>p + Print the currently active page + yes + + + _Find...