IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-23 01:16:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Simon Arlott's 'bug-798564' into stable.

Browse Source
This commit is contained in:
John Ralls 2023-06-22 13:53:36 -07:00
commit 6b48c6ced7
5 changed files with 83 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnucash/gnome-utils/gnc-main-window.cpp
View File

@ -3035,7 +3035,8 @@ gnc_main_window_connect (GncMainWindow *window,
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
notebook = GTK_NOTEBOOK (priv->notebook);
if (gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_OPEN_ADJACENT))
if (!priv->restoring_pages
&& gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_OPEN_ADJACENT))
current_position = g_list_index (priv->installed_pages, priv->current_page) + 1;
priv->installed_pages = g_list_insert (priv->installed_pages, page, current_position);
@ -3044,7 +3045,8 @@ gnc_main_window_connect (GncMainWindow *window,
tab_hbox, menu_label, current_position);
gtk_notebook_set_tab_reorderable (notebook, page->notebook_page, TRUE);
gnc_plugin_page_inserted (page);
gtk_notebook_set_current_page (notebook, current_position);
if (!priv->restoring_pages)
gtk_notebook_set_current_page (notebook, current_position);
if (GNC_PLUGIN_PAGE_GET_CLASS(page)->window_changed)
(GNC_PLUGIN_PAGE_GET_CLASS(page)->window_changed)(page, GTK_WIDGET(window));
@ -3187,7 +3189,8 @@ gnc_main_window_open_page (GncMainWindow *window,
if (gnc_main_window_page_exists(page))
{
gnc_main_window_display_page(page);
if (!gnc_main_window_is_restoring_pages (window))
gnc_main_window_display_page (page);
return;
}

3
gnucash/gnome-utils/gnc-plugin-page.c
View File

@ -888,7 +888,8 @@ gnc_plugin_page_inserted_cb (GncPluginPage *page, gpointer user_data)
page);
// on initial load try and set the page focus
(GNC_PLUGIN_PAGE_GET_CLASS(page)->focus_page)(page, TRUE);
if (!gnc_main_window_is_restoring_pages (GNC_MAIN_WINDOW(page->window)))
(GNC_PLUGIN_PAGE_GET_CLASS(page)->focus_page)(page, TRUE);
}

5
gnucash/gnome/gnc-plugin-page-register.c
View File

@ -1176,6 +1176,8 @@ gnc_plugin_page_register_focus (GncPluginPage* plugin_page,
// set the sheet focus setting
gnc_split_reg_set_sheet_focus (gsr, priv->page_focus);
gnc_ledger_display_set_focus (priv->ledger, priv->page_focus);
}
static GtkWidget*
@ -1202,8 +1204,6 @@ gnc_plugin_page_register_create_widget (GncPluginPage* plugin_page)
LEAVE ("existing widget %p", priv->widget);
return priv->widget;
}
// on create, the page will be the current page so set the focus flag
priv->page_focus = TRUE;
priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE);
@ -1744,7 +1744,6 @@ gnc_plugin_page_register_recreate_page (GtkWidget* window,
/* enable the refresh */
priv->enable_refresh = TRUE;
gnc_ledger_display_refresh (priv->ledger);
LEAVE (" ");
return page;
}

110
gnucash/register/ledger-core/gnc-ledger-display.c
View File

@ -66,6 +66,8 @@ struct gnc_ledger_display
gboolean loading;
gboolean use_double_line_default;
gboolean visible; /* focus */
gboolean needs_refresh;
GNCLedgerDisplayDestroy destroy;
GNCLedgerDisplayGetParent get_parent;
@ -94,8 +96,8 @@ gnc_ledger_display_internal (Account* lead_account, Query* q,
gboolean is_template,
gboolean mismatched_commodities);
static void gnc_ledger_display_refresh_internal (GNCLedgerDisplay* ld,
GList* splits);
static void
gnc_ledger_display_refresh_internal (GNCLedgerDisplay* ld);
static void gnc_ledger_display_make_query (GNCLedgerDisplay* ld,
gint limit,
@ -584,7 +586,6 @@ refresh_handler (GHashTable* changes, gpointer user_data)
GNCLedgerDisplay* ld = user_data;
const EventInfo* info;
gboolean has_leader;
GList* splits;
ENTER ("changes=%p, user_data=%p", changes, user_data);
@ -618,35 +619,15 @@ refresh_handler (GHashTable* changes, gpointer user_data)
}
}
/* if subaccount ledger, check to see if still the same number
* of subaccounts, if not recreate the query. */
if (ld->ld_type == LD_SUBACCOUNT)
if (ld->visible)
{
Account* leader = gnc_ledger_display_leader (ld);
GList* accounts = gnc_account_get_descendants (leader);
if (g_list_length (accounts) != ld->number_of_subaccounts)
gnc_ledger_display_make_query (ld,
gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL_REGISTER, GNC_PREF_MAX_TRANS),
gnc_get_reg_type (leader, ld->ld_type));
g_list_free (accounts);
DEBUG ("immediate refresh because ledger is visible");
gnc_ledger_display_refresh (ld);
}
else
{
ld->needs_refresh = TRUE;
}
// Exclude any template accounts for search register and gl
if (!ld->reg->is_template && (ld->reg->type == SEARCH_LEDGER || ld->ld_type == LD_GL))
exclude_template_accounts (ld->query, ld->excluded_template_acc_hash);
/* Its not clear if we should re-run the query, or if we should
* just use qof_query_last_run(). Its possible that the dates
* changed, requiring a full new query. Similar considerations
* needed for multi-user mode.
*/
splits = qof_query_run (ld->query);
gnc_ledger_display_set_watches (ld, splits);
gnc_ledger_display_refresh_internal (ld, splits);
LEAVE (" ");
}
@ -764,7 +745,6 @@ gnc_ledger_display_internal (Account* lead_account, Query* q,
GNCLedgerDisplay* ld;
gint limit;
const char* klass;
GList* splits;
switch (ld_type)
{
@ -838,6 +818,8 @@ gnc_ledger_display_internal (Account* lead_account, Query* q,
ld->query = NULL;
ld->ld_type = ld_type;
ld->loading = FALSE;
ld->visible = FALSE;
ld->needs_refresh = TRUE;
ld->destroy = NULL;
ld->get_parent = NULL;
ld->user_data = NULL;
@ -867,12 +849,13 @@ gnc_ledger_display_internal (Account* lead_account, Query* q,
gnc_split_register_set_data (ld->reg, ld, gnc_ledger_display_parent);
splits = qof_query_run (ld->query);
gnc_ledger_display_set_watches (ld, splits);
gnc_ledger_display_refresh_internal (ld, splits);
/* Must call this before gnc_table_realize_gui() gets called or all the
* combo boxes will be empty. Use an empty list of splits instad of running
* the query when we're not in focus yet.
*/
ld->loading = TRUE;
gnc_split_register_load (ld->reg, NULL, gnc_ledger_display_leader (ld));
ld->loading = FALSE;
return ld;
}
@ -902,11 +885,22 @@ gnc_ledger_display_find_by_query (Query* q)
\********************************************************************/
static void
gnc_ledger_display_refresh_internal (GNCLedgerDisplay* ld, GList* splits)
gnc_ledger_display_refresh_internal (GNCLedgerDisplay* ld)
{
if (!ld || ld->loading)
GList* splits;
if (ld->loading)
return;
/* It's not clear if we should re-run the query, or if we should
* just use qof_query_last_run(). It's possible that the dates
* changed, requiring a full new query. Similar considerations
* needed for multi-user mode.
*/
splits = qof_query_run (ld->query);
gnc_ledger_display_set_watches (ld, splits);
if (!gnc_split_register_full_refresh_ok (ld->reg))
return;
@ -915,6 +909,7 @@ gnc_ledger_display_refresh_internal (GNCLedgerDisplay* ld, GList* splits)
gnc_split_register_load (ld->reg, splits,
gnc_ledger_display_leader (ld));
ld->needs_refresh = FALSE;
ld->loading = FALSE;
}
@ -935,14 +930,49 @@ gnc_ledger_display_refresh (GNCLedgerDisplay* ld)
return;
}
/* if subaccount ledger, check to see if still the same number
* of subaccounts, if not recreate the query. */
if (ld->ld_type == LD_SUBACCOUNT)
{
Account* leader = gnc_ledger_display_leader (ld);
GList* accounts = gnc_account_get_descendants (leader);
if (g_list_length (accounts) != ld->number_of_subaccounts)
gnc_ledger_display_make_query (ld,
gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL_REGISTER, GNC_PREF_MAX_TRANS),
gnc_get_reg_type (leader, ld->ld_type));
g_list_free (accounts);
}
/* In lieu of not "mis-using" some portion of the infrastructure by writing
* a bunch of new code, we just filter out the accounts of the template
* transactions. While these are in a separate Account trees just for this
* reason, the query engine makes no distinction between Account trees.
* See Gnome Bug 86302.
* -- jsled */
// Exclude any template accounts for search register and gl
if (!ld->reg->is_template && (ld->reg->type == SEARCH_LEDGER || ld->ld_type == LD_GL))
exclude_template_accounts (ld->query, ld->excluded_template_acc_hash);
gnc_ledger_display_refresh_internal (ld, qof_query_run (ld->query));
gnc_ledger_display_refresh_internal (ld);
LEAVE (" ");
}
void gnc_ledger_display_set_focus (GNCLedgerDisplay* ld, gboolean focus)
{
if (!ld)
return;
ld->visible = focus;
if (ld->visible && ld->needs_refresh)
{
DEBUG ("deferred refresh because ledger is now visible");
gnc_ledger_display_refresh (ld);
}
}
void
gnc_ledger_display_refresh_by_split_register (SplitRegister* reg)
{

3
gnucash/register/ledger-core/gnc-ledger-display.h
View File

@ -121,6 +121,9 @@ GNCLedgerDisplay* gnc_ledger_display_find_by_query (Query* q);
void gnc_ledger_display_refresh (GNCLedgerDisplay* ledger_display);
void gnc_ledger_display_refresh_by_split_register (SplitRegister* reg);
/** Mark the ledger as being in focus (refresh immediately) or not. */
void gnc_ledger_display_set_focus (GNCLedgerDisplay* ld, gboolean focus);
/** close the window */
void gnc_ledger_display_close (GNCLedgerDisplay* ledger_display);