gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/343fff51 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f4b34b73 (commit)
	from  https://github.com/Gnucash/gnucash/commit/dc91b968 (commit)



commit 343fff51ac83aa58d4b3b7890cfe009160b28b2e
Merge: dc91b96874 f4b34b7375
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 22 12:05:49 2025 -0700

    Merge Roberto Kok's 'auc-tooltips' into stable.

diff --cc gnucash/import-export/import-main-matcher.cpp
index 74e435bb56,db99b00b0b..8d2d4d6939
--- a/gnucash/import-export/import-main-matcher.cpp
+++ b/gnucash/import-export/import-main-matcher.cpp
@@@ -1596,15 -1601,18 +1601,18 @@@ gnc_gen_trans_init_view (GNCImportMainM
      info->memo_column = add_text_column (view, _("Memo"), DOWNLOADED_COL_MEMO, true);
      add_toggle_column (view, C_("Column header for 'Adding transaction'", "A"),
                         DOWNLOADED_COL_ACTION_ADD,
-                        G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
+                        G_CALLBACK(gnc_gen_trans_add_toggled_cb), info,
 -                       C_("Import transaction tooltip for Add action", "Add as a new transaction"));
++                       _("Add as a new transaction"));
      GtkTreeViewColumn *column = add_toggle_column (view,
                                  C_("Column header for 'Updating plus Clearing transaction'", "U+C"),
                                  DOWNLOADED_COL_ACTION_UPDATE,
-                                 G_CALLBACK(gnc_gen_trans_update_toggled_cb), info);
+                                 G_CALLBACK(gnc_gen_trans_update_toggled_cb), info,
 -                                C_("Import transaction tooltip for Update+Clear action", "Update + Clear Transaction\nUpdate existing transaction with the imported data and mark it as cleared"));
++                                _("Update + Clear Transaction\nUpdate existing transaction with the imported data and mark it as cleared"));
      gtk_tree_view_column_set_visible (column, show_update);
      add_toggle_column (view, C_("Column header for 'Clearing transaction'", "C"),
                         DOWNLOADED_COL_ACTION_CLEAR,
-                        G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info);
+                        G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info,
 -                       C_("Import transaction tooltip for Clear action", "Clear Transaction\nMark existing transaction as cleared without changing its details"));
++                       _("Clear Transaction\nMark existing transaction as cleared without changing its details"));
  
      /* The last column has multiple renderers */
      GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new ();

commit f4b34b7375eb3109e7387dece22364887f90bbd7
Author: Roberto Kok <info at rkok.nl>
Date:   Wed Jun 18 21:44:13 2025 +0700

    [import-main-matcher.cpp] Add tooltips to transaction action columns
    
    Add descriptive tooltips to the A, U+C, and C action columns in the
    generic transaction import matcher.

diff --git a/gnucash/import-export/import-main-matcher.cpp b/gnucash/import-export/import-main-matcher.cpp
index 74e435bb56..db99b00b0b 100644
--- a/gnucash/import-export/import-main-matcher.cpp
+++ b/gnucash/import-export/import-main-matcher.cpp
@@ -1551,7 +1551,7 @@ add_text_column (GtkTreeView *view, const gchar *title, int col_num, bool ellips
 
 static GtkTreeViewColumn *
 add_toggle_column (GtkTreeView *view, const gchar *title, int col_num,
-                   GCallback cb_fn, gpointer cb_arg)
+                   GCallback cb_fn, gpointer cb_arg, const gchar *tooltip_text)
 {
     GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new ();
     GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (title, renderer,
@@ -1564,6 +1564,11 @@ add_toggle_column (GtkTreeView *view, const gchar *title, int col_num,
     g_object_set (G_OBJECT(column), "reorderable", true, NULL);
     g_signal_connect (renderer, "toggled", cb_fn, cb_arg);
     gtk_tree_view_append_column (view, column);
+
+    /* Set tooltip on the column header button */
+    if (tooltip_text)
+        gtk_widget_set_tooltip_text (gtk_tree_view_column_get_button (column), tooltip_text);
+
     return column;
 }
 
@@ -1596,15 +1601,18 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     info->memo_column = add_text_column (view, _("Memo"), DOWNLOADED_COL_MEMO, true);
     add_toggle_column (view, C_("Column header for 'Adding transaction'", "A"),
                        DOWNLOADED_COL_ACTION_ADD,
-                       G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
+                       G_CALLBACK(gnc_gen_trans_add_toggled_cb), info,
+                       C_("Import transaction tooltip for Add action", "Add as a new transaction"));
     GtkTreeViewColumn *column = add_toggle_column (view,
                                 C_("Column header for 'Updating plus Clearing transaction'", "U+C"),
                                 DOWNLOADED_COL_ACTION_UPDATE,
-                                G_CALLBACK(gnc_gen_trans_update_toggled_cb), info);
+                                G_CALLBACK(gnc_gen_trans_update_toggled_cb), info,
+                                C_("Import transaction tooltip for Update+Clear action", "Update + Clear Transaction\nUpdate existing transaction with the imported data and mark it as cleared"));
     gtk_tree_view_column_set_visible (column, show_update);
     add_toggle_column (view, C_("Column header for 'Clearing transaction'", "C"),
                        DOWNLOADED_COL_ACTION_CLEAR,
-                       G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info);
+                       G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info,
+                       C_("Import transaction tooltip for Clear action", "Clear Transaction\nMark existing transaction as cleared without changing its details"));
 
     /* The last column has multiple renderers */
     GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new ();



Summary of changes:
 gnucash/import-export/import-main-matcher.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)