IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-29 20:24:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile window - Retain position in split list after deletion

Browse Source 
The changes for Bug 797236 so that the last selected split is
visible when the list is refreshed has no effect when the Delete
button is used, as the selected split has been deleted.
So preselect the next split after the split to be deleted.
If no next split in the list, select the previous.
The split preselected must have a different parent transaction to
the split to be deleted, as all splits in the transaction will be
deleted.
This commit is contained in:
goodvibes2 2020-05-02 11:41:29 +10:00
parent 79501e58dd
commit 9faba45fd5
1 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
gnucash/gnome/window-reconcile.c
View File

@ -1320,12 +1320,93 @@ gnc_ui_reconcile_window_unrec_cb(GtkButton *button, gpointer data)
}
/** Get the debit or credit view that has at least 1 split selected.
* gnc_reconcile_window_focus_cb() ensures only 1 view
* has a selection.
* @param window The reconcile window.
*/
static GNCReconcileView *
gnc_reconcile_window_get_selection_view (RecnWindow *recnData)
{
if (gnc_reconcile_view_num_selected (GNC_RECONCILE_VIEW (recnData->debit)) > 0)
return GNC_RECONCILE_VIEW (recnData->debit);
if (gnc_reconcile_view_num_selected (GNC_RECONCILE_VIEW (recnData->credit)) > 0)
return GNC_RECONCILE_VIEW (recnData->credit);
return NULL;
}
/** Select the next split in the debit or credit view so that after the Delete
* button is actioned, the working position in the list is still in view.
* Unless this is done, the list will be scrolled to the top.
* The new split selected must have a different parent transaction as all splits
* for the transaction will be deleted.
*/
static void
gnc_reconcile_window_delete_set_next_selection (RecnWindow *recnData, Split *split)
{
GNCReconcileView *view = gnc_reconcile_window_get_selection_view (recnData);
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
Split *this_split = NULL;
GtkTreeIter iter;
GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
GList *path_list, *node;
GtkTreePath *path, *save_del_path;
Transaction* trans = xaccSplitGetParent (split); // parent transaction of the split to delete
if (!view)
return; // no selected split
path_list = gtk_tree_selection_get_selected_rows (selection, &model);
// get path of the first split selected - there should be only 1 selected
node = g_list_first (path_list);
if (!node)
return;
path = node->data;
save_del_path = gtk_tree_path_copy (path);
gtk_tree_path_next (path);
if (gtk_tree_model_get_iter (model, &iter, path))
{
do
{
gtk_tree_model_get (model, &iter, REC_POINTER, &this_split, -1);
}
while (xaccSplitGetParent (this_split) == trans && gtk_tree_model_iter_next (model, &iter));
}
if ((!this_split) || xaccSplitGetParent (this_split) == trans)
{
// There aren't any splits for a different transaction after the split to be deleted,
// so find the previous split having a different parent transaction
path = save_del_path; // split to be deleted
if (gtk_tree_path_prev (path) && gtk_tree_model_get_iter (model, &iter, path))
{
do
{
gtk_tree_model_get (model, &iter, REC_POINTER, &this_split, -1);
}
while (xaccSplitGetParent (this_split) == trans && gtk_tree_model_iter_previous (model, &iter));
}
}
gtk_tree_path_free (save_del_path);
g_list_free_full (path_list, (GDestroyNotify) gtk_tree_path_free);
if ((!this_split) || xaccSplitGetParent (this_split) == trans)
return;
gtk_tree_selection_select_iter (selection, &iter);
}
static void
gnc_ui_reconcile_window_delete_cb(GtkButton *button, gpointer data)
{
RecnWindow *recnData = data;
Transaction *trans;
Split *split;
Split *split, *next_split;
split = gnc_reconcile_window_get_current_split(recnData);
/* This should never be true, but be paranoid */
@ -1343,6 +1424,9 @@ gnc_ui_reconcile_window_delete_cb(GtkButton *button, gpointer data)
return;
}
/* select the split that should be visible after the deletion */
gnc_reconcile_window_delete_set_next_selection(recnData, split);
gnc_suspend_gui_refresh ();
trans = xaccSplitGetParent(split);