From caeea74b5003788a79fd684e50244dac44f11e93 Mon Sep 17 00:00:00 2001 From: David Cousens Date: Sat, 29 Jun 2019 07:43:10 +1000 Subject: [PATCH] Add view_selection_function view_selection_function added to only allow adding a row to the selection if GNCImport_Add is set for the transaction. Explicit selection clearing try explicitly clearing the row in the add, update and clear toggle callbacks - before refresh row and add debugging info which showed that the selection is called after exiting the above callbacks and as the view_selection_function has no knowledge that the add checkbox has just been toggled it allows the row to be selected. Requires a flag to be set in the add_toggle_cb which prevents selection in the view_selection_function and is cleared there. Fix row being selected after A(dd)toggled When the A is toggled on from U+R or R the row is automatically selected and if the row is toggled back to U+R or R selected, it cannot be unselected. Add a global add-toggled flag set in the gnc_gen_trans_add-toggled_cb and used in the treeview multiple selection function to prevent a row being selected immediately after the A has been toggled. Fix to Multiple selection to ensure the match dialog comes up on double click on a reconciled or update row and implement a view_selection_function so that only rows flagged for addition can be added to a selection Fixes requested by Bob-IT removed global add_toggled variable and added it to _main_matcher_info structure. modified gnc_gen_trans_add_toggled_cb and view_selection_function to use the _main_matcher_info member. --- gnucash/import-export/import-main-matcher.c | 117 ++++++++++++++++++-- 1 file changed, 109 insertions(+), 8 deletions(-) diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c index be39bcf0f1..d6c52169dc 100644 --- a/gnucash/import-export/import-main-matcher.c +++ b/gnucash/import-export/import-main-matcher.c @@ -54,6 +54,7 @@ #define GNC_PREFS_GROUP "dialogs.import.generic.transaction-list" + struct _main_matcher_info { GtkWidget *main_widget; @@ -65,6 +66,7 @@ struct _main_matcher_info gpointer user_data; GNCImportPendingMatches *pending_matches; GtkTreeViewColumn *account_column; + gboolean add_toggled; // flag to indicate that add has been toggled to stop selection }; enum downloaded_cols @@ -90,7 +92,10 @@ enum downloaded_cols #define CSS_INT_PROB_REQUIRED_CLASS "intervention-probably-required" #define CSS_INT_NOT_REQUIRED_CLASS "intervention-not-required" -static QofLogModule log_module = GNC_MOD_IMPORT; +/* Define log domain for extended debugging of matcher */ +#define G_MOD_IMPORT_MATCHER "gnc.import.main-matcher" +/*static QofLogModule log_module = GNC_MOD_IMPORT;*/ +static QofLogModule log_module = G_MOD_IMPORT_MATCHER; void on_matcher_ok_clicked (GtkButton *button, GNCImportMainMatcher *info); void on_matcher_cancel_clicked (GtkButton *button, gpointer user_data); @@ -117,6 +122,11 @@ static gboolean gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview, static gboolean gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview, GdkEvent *event, GNCImportMainMatcher *info); +static gboolean view_selection_function (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer data); static void refresh_model_row (GNCImportMainMatcher *gui, GtkTreeModel *model, GtkTreeIter *iter, GNCImportTransInfo *info); /* end local prototypes */ @@ -306,6 +316,7 @@ gnc_gen_trans_add_toggled_cb (GtkCellRendererToggle *cell_renderer, GtkTreeIter iter; GNCImportTransInfo *trans_info; + ENTER(""); model = gtk_tree_view_get_model (gui->view); if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) return; @@ -319,8 +330,10 @@ gnc_gen_trans_add_toggled_cb (GtkCellRendererToggle *cell_renderer, else { gnc_import_TransInfo_set_action (trans_info, GNCImport_ADD); + gui->add_toggled =TRUE; //flag A(dd) has just been toggled to view_selection_function } refresh_model_row (gui, model, &iter, trans_info); + LEAVE(""); } static void @@ -331,8 +344,10 @@ gnc_gen_trans_clear_toggled_cb (GtkCellRendererToggle *cell_renderer, GtkTreeModel *model; GtkTreeIter iter; GNCImportTransInfo *trans_info; - + + ENTER(""); model = gtk_tree_view_get_model (gui->view); + if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) return; gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1); @@ -347,6 +362,7 @@ gnc_gen_trans_clear_toggled_cb (GtkCellRendererToggle *cell_renderer, gnc_import_TransInfo_set_action (trans_info, GNCImport_CLEAR); } refresh_model_row (gui, model, &iter, trans_info); + LEAVE(""); } static void @@ -357,8 +373,10 @@ gnc_gen_trans_update_toggled_cb (GtkCellRendererToggle *cell_renderer, GtkTreeModel *model; GtkTreeIter iter; GNCImportTransInfo *trans_info; - + + ENTER(""); model = gtk_tree_view_get_model (gui->view); + if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) return; gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1); @@ -373,6 +391,7 @@ gnc_gen_trans_update_toggled_cb (GtkCellRendererToggle *cell_renderer, gnc_import_TransInfo_set_action (trans_info, GNCImport_UPDATE); } refresh_model_row (gui, model, &iter, trans_info); + LEAVE(""); } static void @@ -457,7 +476,7 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem, GList *selected_rows, *l; gboolean first, is_selection; - ENTER(""); + ENTER("assign_transfer_account_to_selection_cb"); treeview = GTK_TREE_VIEW(info->view); model = gtk_tree_view_get_model (treeview); selection = gtk_tree_view_get_selection (treeview); @@ -481,7 +500,7 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem, DEBUG("passing account value = %s", gnc_account_get_full_name (assigned_account)); gnc_gen_trans_assign_transfer_account (treeview, - &first, is_selection, l->data, &assigned_account, info); + &first, is_selection, l->data, &assigned_account, info); DEBUG("returned value of account = %s", gnc_account_get_full_name (assigned_account)); DEBUG("returned value of first = %s", first ? "true" : "false"); @@ -614,14 +633,16 @@ gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview, GNCImportMainMatcher *info) { GtkTreeSelection *selection; - ENTER(""); + ENTER("onPopupMenu_cb"); /* respond to Shift-F10 popup menu hotkey */ selection = gtk_tree_view_get_selection (treeview); if (gtk_tree_selection_count_selected_rows (selection) > 0) { gnc_gen_trans_view_popup_menu (treeview, NULL, info); + LEAVE ("TRUE"); + return TRUE; } - LEAVE (""); + LEAVE ("FALSE"); return TRUE; } @@ -750,8 +771,21 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info, gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store), DOWNLOADED_COL_DATE_INT64, GTK_SORT_ASCENDING); - selection = gtk_tree_view_get_selection (info->view); + + /* set a selection function which will block selection of rows which are not + flagged to be imported into Gnucash */ + gtk_tree_selection_set_select_function + (selection, + view_selection_function, + info, + NULL); + /* clear the flag which indicates that A(dd) has been toggled so that the + view_selection_function can block selection of a row when the + view_selection_function is called immediately after A(dd) is toggled + on that row */ + info->add_toggled = FALSE; + g_signal_connect (info->view, "row-activated", G_CALLBACK(gnc_gen_trans_row_activated_cb), info); g_signal_connect (selection, "changed", @@ -763,6 +797,73 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info, G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info); } +static gboolean +view_selection_function (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer data) +{ + GtkTreeIter iter; + GNCImportTransInfo *trans_info; + GNCImportAction action; + GNCImportMainMatcher *info = data; + + ENTER("view_selection_function"); + if (gtk_tree_model_get_iter(model, &iter, path)) + { + gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1); + switch (gnc_import_TransInfo_get_action (trans_info)) + { + case GNCImport_ADD: + DEBUG("Import action = ADD row selected"); + if (info->add_toggled) + { + DEBUG("Add just toggled- do not select the row."); + info->add_toggled = FALSE; + LEAVE("FALSE"); + return FALSE; + } + else + { + DEBUG("Add has not been toggled - select the row"); + LEAVE("TRUE"); + return TRUE; + } + case GNCImport_UPDATE: + DEBUG("Import action = UPDATE row not selected"); + LEAVE("FALSE"); + return FALSE; + case GNCImport_CLEAR: + DEBUG("Import action = CLEAR row not selected"); + LEAVE("FALSE"); + return FALSE; + case GNCImport_SKIP: + DEBUG("Import action = SKIP row not selected"); + LEAVE("FALSE"); + return FALSE; + case GNCImport_LAST_ACTION: + DEBUG("Import action = LAST_ACTION row not selected"); + LEAVE("FALSE"); + return FALSE; + case GNCImport_INVALID_ACTION: + DEBUG("Import action = LAST_ACTION row not selected"); + LEAVE("FALSE"); + return FALSE; + default: + DEBUG("Import action = UNDEFINED -cannot select"); + LEAVE("FALSE"); + return FALSE; + } + } + else + { + DEBUG("path to selected row undefined"); + LEAVE("FALSE"); + return FALSE; + } +} + static void show_account_column_toggled_cb (GtkToggleButton *togglebutton, GNCImportMainMatcher *info)