Fix the file print menu item

Create a placeholder for the file print item as the label can change for different pages. Also fix the sensitivity depending on page.
2025-02-25 18:55:30 -06:00 · 2022-11-04 17:32:27 +00:00 · 2022-11-04 17:32:27 +00:00 · e16217a219
commit e16217a219
parent bf648f6ed5
21 changed files with 119 additions and 17 deletions
--- 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))
        {
--- 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",
--- 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",
--- 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,
--- 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",
--- 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",
--- 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",
--- 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,
--- 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,
--- 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,
 };

--- a/gnucash/ui/gnc-main-window.ui
+++ b/gnucash/ui/gnc-main-window.ui
@ -32,10 +32,9 @@
      </section>
      <section>
        <item>
-          <attribute name="label" translatable="yes">_Print</attribute>
-          <attribute name="action">mainwin.FilePrintAction</attribute>
-          <attribute name="accel">&lt;Primary&gt;p</attribute>
-          <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+          <attribute name="label" translatable="no">PrintPlaceholder</attribute>
+          <attribute name="action">mainwin.FilePlaceholder3</attribute>
+          <attribute name="hidden-when">action-disabled</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">Pa_ge Setup...</attribute>
@ -45,7 +44,7 @@
        </item>
        <item>
          <attribute name="label" translatable="no">PdfPlaceholder</attribute>
-          <attribute name="action">mainwin.FilePlaceholder3</attribute>
+          <attribute name="action">mainwin.FilePlaceholder4</attribute>
          <attribute name="hidden-when">action-disabled</attribute>
        </item>
        <submenu>
@ -53,7 +52,7 @@
          <attribute name="action">mainwin.FileExportAction</attribute>
          <item>
            <attribute name="label" translatable="no">ExportPlaceholder</attribute>
-            <attribute name="action">mainwin.FilePlaceholder4</attribute>
+            <attribute name="action">mainwin.FilePlaceholder5</attribute>
            <attribute name="hidden-when">action-disabled</attribute>
          </item>
        </submenu>
@ -69,7 +68,7 @@
      <section>
        <item>
          <attribute name="label" translatable="no">RecentPlaceholder</attribute>
-          <attribute name="action">mainwin.FilePlaceholder5</attribute>
+          <attribute name="action">mainwin.FilePlaceholder6</attribute>
          <attribute name="hidden-when">action-disabled</attribute>
        </item>
      </section>
--- a/gnucash/ui/gnc-plugin-basic-commands.ui
+++ b/gnucash/ui/gnc-plugin-basic-commands.ui
@ -36,7 +36,17 @@
    </item>
  </menu>

-  <menu id="FilePlaceholder4">
+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">mainwin.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
+  <menu id="FilePlaceholder5">
    <item>
      <attribute name="label" translatable="yes">Export _Accounts</attribute>
      <attribute name="action">gnc-plugin-basic-commands-actions.FileExportAccountsAction</attribute>
@ -44,6 +54,16 @@
    </item>
  </menu>

+  <menu id="EditPlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Find...</attribute>
+      <attribute name="action">gnc-plugin-basic-commands-actions.EditFindTransactionsAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;f</attribute>
+      <attribute name="tooltip" translatable="yes">Find transactions with a search</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+   </menu>
+
  <menu id="EditPlaceholder5">
    <item>
 <!-- Translators: remember to reuse this translation in dialog-account.glade -->
--- a/gnucash/ui/gnc-plugin-csv-export.ui
+++ b/gnucash/ui/gnc-plugin-csv-export.ui
@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface>

-  <menu id="FilePlaceholder4">
+  <menu id="FilePlaceholder5">
    <item>
      <attribute name="label" translatable="yes">Export Account T_ree to CSV...</attribute>
      <attribute name="action">gnc-plugin-csv-export-actions.CsvExportTreeAction</attribute>
--- a/gnucash/ui/gnc-plugin-file-history.ui
+++ b/gnucash/ui/gnc-plugin-file-history.ui
@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface>

-  <menu id="FilePlaceholder5">
+  <menu id="FilePlaceholder6">
    <item>
      <attribute name="label" translatable="no">RecentFile0Action</attribute>
      <attribute name="action">gnc-plugin-file-history-actions.RecentFile0Action</attribute>
--- a/gnucash/ui/gnc-plugin-page-account-tree.ui
+++ b/gnucash/ui/gnc-plugin-page-account-tree.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">mainwin.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder1">
    <item>
      <attribute name="label" translatable="yes">_Edit Account</attribute>
--- a/gnucash/ui/gnc-plugin-page-budget.ui
+++ b/gnucash/ui/gnc-plugin-page-budget.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">mainwin.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder1">
    <item>
      <attribute name="label" translatable="yes">Esti_mate Budget...</attribute>
--- a/gnucash/ui/gnc-plugin-page-invoice.ui
+++ b/gnucash/ui/gnc-plugin-page-invoice.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">GncPluginPageInvoiceActions.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder1">
    <item>
      <attribute name="label" translatable="no">EditEditInvoiceAction</attribute>
--- a/gnucash/ui/gnc-plugin-page-owner-tree.ui
+++ b/gnucash/ui/gnc-plugin-page-owner-tree.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">mainwin.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder2-c">
    <item>
      <attribute name="label" translatable="yes">E_dit Customer</attribute>
--- a/gnucash/ui/gnc-plugin-page-register.ui
+++ b/gnucash/ui/gnc-plugin-page-register.ui
@ -1,6 +1,15 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print Cheques</attribute>
+      <attribute name="action">GncPluginPageRegisterActions.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder1">
    <item>
      <attribute name="label" translatable="yes">Assign as payment...</attribute>
--- a/gnucash/ui/gnc-plugin-page-report.ui
+++ b/gnucash/ui/gnc-plugin-page-report.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print Report</attribute>
+      <attribute name="action">GncPluginPageReportActions.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the current report</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder6">
    <item>
      <attribute name="label" translatable="yes">_Report Options</attribute>
@ -10,7 +20,7 @@
    </item>
  </menu>

-  <menu id="FilePlaceholder3">
+  <menu id="FilePlaceholder4">
    <item>
      <attribute name="label" translatable="yes">Export as P_DF...</attribute>
      <attribute name="action">GncPluginPageReportActions.FilePrintPDFAction</attribute>
@ -19,7 +29,7 @@
    </item>
  </menu>

-  <menu id="FilePlaceholder4">
+  <menu id="FilePlaceholder5">
    <item>
      <attribute name="label" translatable="yes">Export _Report</attribute>
      <attribute name="action">GncPluginPageReportActions.ReportExportAction</attribute>
--- a/gnucash/ui/gnc-plugin-page-sx-list.ui
+++ b/gnucash/ui/gnc-plugin-page-sx-list.ui
@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <interface>

+  <menu id="FilePlaceholder3">
+    <item>
+      <attribute name="label" translatable="yes">_Print</attribute>
+      <attribute name="action">mainwin.FilePrintAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;p</attribute>
+      <attribute name="tooltip" translatable="yes">Print the currently active page</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+  </menu>
+
  <menu id="EditPlaceholder3">
    <item>
      <attribute name="label" translatable="yes">_Find...</attribute>