Merge Brian Rater's '798570' into maint.

This commit is contained in:
John Ralls 2023-03-17 13:09:36 -07:00
commit 207b105b9c

View File

@ -1547,6 +1547,14 @@ The function will step through to only display the columns that are set
void void
gnc_budget_view_refresh (GncBudgetView *budget_view) gnc_budget_view_refresh (GncBudgetView *budget_view)
{ {
// Column identifiers
enum {
code_column = 1,
description_column = 2,
startPeriods_column = 3
// The Totals column will be after the periods columns.
};
GncBudgetViewPrivate *priv; GncBudgetViewPrivate *priv;
gint num_periods; gint num_periods;
gint num_periods_visible; gint num_periods_visible;
@ -1589,13 +1597,13 @@ gnc_budget_view_refresh (GncBudgetView *budget_view)
// set visibility of the account code columns // set visibility of the account code columns
code_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "account-code"); code_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "account-code");
gtk_tree_view_column_set_visible (code_col, priv->show_account_code); gtk_tree_view_column_set_visible (code_col, priv->show_account_code);
code_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), 1); code_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), code_column);
gtk_tree_view_column_set_visible (code_col, priv->show_account_code); gtk_tree_view_column_set_visible (code_col, priv->show_account_code);
// set visibility of the account description columns // set visibility of the account description columns
desc_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "description"); desc_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "description");
gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc); gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc);
desc_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), 2); desc_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), description_column);
gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc); gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc);
/* If we're creating new columns to be appended to already existing /* If we're creating new columns to be appended to already existing
@ -1607,7 +1615,8 @@ gnc_budget_view_refresh (GncBudgetView *budget_view)
col = priv->total_col; col = priv->total_col;
gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->tree_view), col); gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->tree_view), col);
priv->total_col = NULL; priv->total_col = NULL;
col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), num_periods_visible + 1); col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view),
startPeriods_column + num_periods_visible);
gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->totals_tree_view), col); gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->totals_tree_view), col);
} }