IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798890 - Printing Problem

Browse Source
This commit is contained in:
John Ralls 2023-09-16 12:49:16 -07:00
parent 09474bb251
commit 2038903eee
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnucash/gnome/gnc-plugin-page-report.cpp
View File

@ -102,7 +102,7 @@ typedef struct GncPluginPageReportPrivate
/// The report-id /// The report-id
int reportId; int reportId;
gint component_manager_id; gint component_manager_id;
GSimpleActionGroup* action_group;
/// The report which this Page is satisfying /// The report which this Page is satisfying
SCM cur_report; SCM cur_report;
/// The Option DB for this report. /// The Option DB for this report.
@ -201,6 +201,17 @@ static GActionEntry report_actions[] =
{ "ReportStopAction", gnc_plugin_page_report_stop_cb, nullptr, nullptr, nullptr }, { "ReportStopAction", gnc_plugin_page_report_stop_cb, nullptr, nullptr, nullptr },
}; };
static guint num_report_actions = G_N_ELEMENTS(report_actions); static guint num_report_actions = G_N_ELEMENTS(report_actions);
static const gchar *initially_insensitive_actions[] =
{
nullptr
};
static const gchar *disable_during_load_actions[] =
{
"FilePrintAction",
"FilePrintPDFAction",
"ReportOptionsAction"
};
/** The default menu items that need to be add to the menu */ /** The default menu items that need to be add to the menu */
static const gchar *gnc_plugin_load_ui_items [] = static const gchar *gnc_plugin_load_ui_items [] =
@ -443,6 +454,8 @@ gnc_plugin_page_report_load_uri (GncPluginPage *page)
g_object_remove_weak_pointer(G_OBJECT(page), (gpointer*)(&weak_page)); g_object_remove_weak_pointer(G_OBJECT(page), (gpointer*)(&weak_page));
} }
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, TRUE);
// this resets the window for the progressbar to nullptr // this resets the window for the progressbar to nullptr
gnc_window_set_progressbar_window( nullptr ); gnc_window_set_progressbar_window( nullptr );
} }
@ -794,6 +807,8 @@ gnc_plugin_page_report_option_change_cb(gpointer data)
/* it's probably already dirty, but make sure */ /* it's probably already dirty, but make sure */
scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T); scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T);
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, FALSE);
// prevent closing this page while loading... // prevent closing this page while loading...
priv->reloading = TRUE; priv->reloading = TRUE;
@ -811,6 +826,8 @@ gnc_plugin_page_report_option_change_cb(gpointer data)
// this resets the window for the progressbar to nullptr // this resets the window for the progressbar to nullptr
gnc_window_set_progressbar_window( nullptr ); gnc_window_set_progressbar_window( nullptr );
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, FALSE);
priv->reloading = FALSE; priv->reloading = FALSE;
} }
@ -1175,14 +1192,11 @@ gnc_plugin_page_report_destroy(GncPluginPageReportPrivate * priv)
scm_gc_unprotect_object(priv->edited_reports); scm_gc_unprotect_object(priv->edited_reports);
} }
static const gchar *initially_insensitive_actions[] =
{
nullptr
};
static void static void
gnc_plugin_page_report_init ( GncPluginPageReport *plugin_page ) gnc_plugin_page_report_init ( GncPluginPageReport *plugin_page )
{ {
GncPluginPageReportPrivate *priv = GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(plugin_page);
priv->action_group = NULL;
} }
static GObject* static GObject*
@ -1277,7 +1291,6 @@ static void
gnc_plugin_page_report_constr_init (GncPluginPageReport *plugin_page, gint reportId) gnc_plugin_page_report_constr_init (GncPluginPageReport *plugin_page, gint reportId)
{ {
GncPluginPageReportPrivate *priv; GncPluginPageReportPrivate *priv;
GSimpleActionGroup *simple_action_group;
GncPluginPage *parent; GncPluginPage *parent;
gboolean use_new; gboolean use_new;
gchar *name; gchar *name;
@ -1304,14 +1317,16 @@ gnc_plugin_page_report_constr_init (GncPluginPageReport *plugin_page, gint repor
gnc_plugin_page_add_book (parent, gnc_get_current_book()); gnc_plugin_page_add_book (parent, gnc_get_current_book());
/* Create menu and toolbar information */ /* Create menu and toolbar information */
simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageReportActions"); priv->action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageReportActions");
g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), g_action_map_add_action_entries (G_ACTION_MAP(priv->action_group),
report_actions, report_actions,
num_report_actions, num_report_actions,
plugin_page); plugin_page);
gnc_plugin_set_actions_enabled (G_ACTION_MAP(simple_action_group), initially_insensitive_actions, gnc_plugin_set_actions_enabled (G_ACTION_MAP(priv->action_group), initially_insensitive_actions,
FALSE); FALSE);
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, FALSE);
} }
GncPluginPage* GncPluginPage*
@ -1456,7 +1471,9 @@ gnc_plugin_page_report_reload_cb (GSimpleAction *simple,
scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T); scm_call_2(dirty_report, priv->cur_report, SCM_BOOL_T);
/* now queue the fact that we need to reload this report */ /* now queue the fact that we need to reload this report */
// Disable some actions reported to crash while loading
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, FALSE);
// prevent closing this page while loading... // prevent closing this page while loading...
priv->reloading = TRUE; priv->reloading = TRUE;
// this sets the window for the progressbar // this sets the window for the progressbar
@ -1471,6 +1488,8 @@ gnc_plugin_page_report_reload_cb (GSimpleAction *simple,
// this resets the window for the progressbar to nullptr // this resets the window for the progressbar to nullptr
gnc_window_set_progressbar_window( nullptr ); gnc_window_set_progressbar_window( nullptr );
gnc_plugin_set_actions_enabled(G_ACTION_MAP(priv->action_group),
disable_during_load_actions, FALSE);
priv->reloading = FALSE; priv->reloading = FALSE;
} }