From 6f74d4e3ed63753f85f2c0aea78db6e468083514 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sat, 9 Jul 2022 21:36:46 +0800 Subject: [PATCH] [import-main-matcher] show Edit menuitem, disable if disallowed --- gnucash/import-export/import-main-matcher.c | 51 ++++++++------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c index 9b0395eed5..cf3ee41a45 100644 --- a/gnucash/import-export/import-main-matcher.c +++ b/gnucash/import-export/import-main-matcher.c @@ -1114,7 +1114,6 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, GNCImportMainMatcher *info) { GtkWidget *menu, *menuitem; - GdkEventButton *event_button; GtkTreeModel *model; GtkTreeSelection *selection; GList *selected_rows; @@ -1156,40 +1155,28 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, rowinfo_free (rowinfo); } - if (edit_desc) - { - menuitem = gtk_menu_item_new_with_label ( - _("Edit description.")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (gnc_gen_trans_edit_description_cb), - info); - DEBUG("Callback to edit description"); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - } + menuitem = gtk_menu_item_new_with_label (_("Edit description.")); + gtk_widget_set_sensitive (menuitem, edit_desc); + g_signal_connect (menuitem, "activate", + G_CALLBACK (gnc_gen_trans_edit_description_cb), + info); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - if (edit_memo) - { - menuitem = gtk_menu_item_new_with_label ( - _("Edit memo.")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (gnc_gen_trans_edit_memo_cb), - info); - DEBUG("Callback to edit memo"); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - } + menuitem = gtk_menu_item_new_with_label (_("Edit memo.")); + gtk_widget_set_sensitive (menuitem, edit_memo); + g_signal_connect (menuitem, "activate", + G_CALLBACK (gnc_gen_trans_edit_memo_cb), + info); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + + menuitem = gtk_menu_item_new_with_label (_("Edit notes.")); + gtk_widget_set_sensitive (menuitem, edit_notes); + g_signal_connect (menuitem, "activate", + G_CALLBACK (gnc_gen_trans_edit_notes_cb), + info); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - if (edit_notes) - { - menuitem = gtk_menu_item_new_with_label ( - _("Edit notes.")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (gnc_gen_trans_edit_notes_cb), - info); - DEBUG("Callback to edit notes"); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - } gtk_widget_show_all (menu); - event_button = (GdkEventButton *) event; /* Note: event can be NULL here when called from view_onPopupMenu; */ gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent*)event);