diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index 828bb28bf6..d1cd6396b9 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -740,6 +740,9 @@
ok_button1
+
@@ -1095,6 +1098,35 @@
3
+
+
+
+ 0
+ 11
+ 2
+
+
@@ -1257,9 +1289,9 @@
- matcher__help
matcher_cancel
matcher_ok
+ matcher__help
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index d6c52169dc..3ad4af318d 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -104,31 +104,32 @@ void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
/* Local prototypes */
static void gnc_gen_trans_assign_transfer_account (
- GtkTreeView *treeview,
- gboolean *first,
- gboolean is_selection,
- GtkTreePath *path,
- Account **new_acc,
- GNCImportMainMatcher *info);
+ GtkTreeView *treeview,
+ gboolean *first,
+ gboolean is_selection,
+ GtkTreePath *path,
+ Account **new_acc,
+ GNCImportMainMatcher *info);
static void gnc_gen_trans_assign_transfer_account_to_selection_cb (
- GtkMenuItem *menuitem,
- GNCImportMainMatcher *info);
-static void gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info);
-static gboolean gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info);
-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);
+ GtkMenuItem *menuitem,
+ GNCImportMainMatcher *info);
+static void gnc_gen_trans_view_popup_menu (
+ GtkTreeView *treeview,
+ GdkEvent *event,
+ GNCImportMainMatcher *info);
+static gboolean gnc_gen_trans_onButtonPressed_cb (
+ GtkTreeView *treeview,
+ GdkEvent *event,
+ GNCImportMainMatcher *info);
+static gboolean gnc_gen_trans_onPopupMenu_cb (
+ GtkTreeView *treeview,
+ GdkEvent *event,
+ GNCImportMainMatcher *info);
+static void refresh_model_row (
+ GNCImportMainMatcher *gui,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ GNCImportTransInfo *info);
/* end local prototypes */
void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
@@ -243,6 +244,7 @@ on_matcher_help_clicked (GtkButton *button, gpointer user_data)
gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer3");
gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer4");
gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer5");
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer1");
gnc_builder_add_from_file (builder, "dialog-import.glade", "matcher_help_dialog");
if (info->dark_theme == TRUE)
@@ -287,14 +289,15 @@ run_account_picker_dialog (GNCImportMainMatcher *info,
g_assert (trans_info);
old_acc = gnc_import_TransInfo_get_destacc (trans_info);
- new_acc = gnc_import_select_account (info->main_widget,
- NULL,
- TRUE,
- _("Destination account for the auto-balance split."),
- xaccTransGetCurrency (gnc_import_TransInfo_get_trans (trans_info)),
- ACCT_TYPE_NONE,
- old_acc,
- &ok_pressed);
+ new_acc = gnc_import_select_account (
+ info->main_widget,
+ NULL,
+ TRUE,
+ _("Destination account for the auto-balance split."),
+ xaccTransGetCurrency (gnc_import_TransInfo_get_trans (trans_info)),
+ ACCT_TYPE_NONE,
+ old_acc,
+ &ok_pressed);
if (ok_pressed)
gnc_import_TransInfo_set_destacc (trans_info, new_acc, TRUE);
}
@@ -464,8 +467,9 @@ gnc_gen_trans_assign_transfer_account (GtkTreeView *treeview,
}
static void
-gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
- GNCImportMainMatcher *info)
+gnc_gen_trans_assign_transfer_account_to_selection_cb (
+ GtkMenuItem *menuitem,
+ GNCImportMainMatcher *info)
{
GtkTreeView *treeview;
GtkTreeSelection *selection;
@@ -494,13 +498,15 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
{
gchar *path_str = gtk_tree_path_to_string (l->data);
DEBUG("passing first = %s", first ? "true" : "false");
- DEBUG("passing is_selection = %s", is_selection ? "true" : "false");
+ DEBUG("passing is_selection = %s",
+ is_selection ? "true" : "false");
DEBUG("passing path = %s", path_str);
g_free (path_str);
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");
@@ -575,7 +581,8 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
ENTER ("");
menu = gtk_menu_new();
- menuitem = gtk_menu_item_new_with_label (_("Assign a transfer account."));
+ menuitem = gtk_menu_item_new_with_label (
+ _("Assign a transfer account to the selection."));
g_signal_connect (menuitem, "activate",
G_CALLBACK(
gnc_gen_trans_assign_transfer_account_to_selection_cb),
@@ -617,7 +624,7 @@ gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
selection = gtk_tree_view_get_selection (treeview);
if (gtk_tree_selection_count_selected_rows (selection) > 0)
{
- gnc_gen_trans_view_popup_menu (treeview, event, info);
+ gnc_gen_trans_view_popup_menu (treeview, event, info);
}
LEAVE("return TRUE");
return TRUE;
@@ -646,7 +653,6 @@ gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
return TRUE;
}
-
static GtkTreeViewColumn *
add_text_column(GtkTreeView *view, const gchar *title, int col_num)
{