gnucash stable: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/64f2d90a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/75b7c7bf (commit)
	from  https://github.com/Gnucash/gnucash/commit/cdf801da (commit)



commit 64f2d90ad7c8fbdb4135ad8bb10310f9c05de137
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Jul 26 15:51:55 2024 +0200

    CsvImp - minor cleanups in test code

diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index aad18520e0..161f3fd0c4 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -36,20 +36,20 @@
 #include <stdlib.h>     /* getenv */
 
 
-typedef struct
+struct tokenize_csv_test_data
 {
     const char *csv_line;
     uint        num_fields;
     const char *fields [8];
-} tokenize_csv_test_data;
+};
 
-typedef struct
+struct tokenize_fw_test_data
 {
     const char *fw_line;
     uint        num_fields;
     uint        field_widths[8];
     const char *fields [8];
-} tokenize_fw_test_data;
+};
 
 class GncTokenizerTest : public ::testing::Test
 {
@@ -68,7 +68,7 @@ protected:
     void set_utf8_contents(std::unique_ptr<GncTokenizer> &tokenizer, const std::string& newcontents)
     { tokenizer->m_utf8_contents = newcontents; }
     void test_gnc_tokenize_helper (const std::string& separators, tokenize_csv_test_data* test_data); // for csv tokenizer
-    void test_gnc_tokenize_helper (tokenize_fw_test_data* test_data); // for csv tokenizer
+    void test_gnc_tokenize_helper (tokenize_fw_test_data* test_data); // for fw tokenizer
 
     std::unique_ptr<GncTokenizer> fw_tok;
     std::unique_ptr<GncTokenizer> csv_tok;
diff --git a/gnucash/import-export/csv-imp/test/test-tx-import.cpp b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
index e9a559aa17..41cedc6b2f 100644
--- a/gnucash/import-export/csv-imp/test/test-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
@@ -41,14 +41,14 @@
 //    GncTxImport* parse_data;
 //} Fixture;
 
-typedef struct
+struct parse_date_data
 {
     int          date_fmt;
     const gchar *date_str;
     int          exp_year;
     int          exp_month;
     int          exp_day;
-} parse_date_data;
+};
 
 class GncTxImportTest : public ::testing::Test
 {

commit 75b7c7bfd3d8318abf79d4e0df52cf280c5e5c44
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Jul 26 15:27:06 2024 +0200

    Csv Import - improve assisant's introduction page

diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
index 5f418cbd1e..acc66a567f 100644
--- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
@@ -46,13 +46,13 @@
 For a successful import three columns have to be available in the import data:
 • a Date column
 • a Description column
-• a Deposit or Withdrawal column
+• an Amount or Amount (Negated) column
 
 If there is no Account data available, a base account can be selected to which all data will be imported.
 
 Apart from a choice of delimiter, there are several options to tweak the importer. For example a number of lines can be skipped at the start or the end of the data, as well as odd rows. Several date and number formats are supported. The file encoding can be defined.
 
-The importer can handle files where transactions are split over multiple lines, with each line representing one split.
+The importer can handle files where transactions are split over multiple lines, with each line representing one split. A new transaction is started each time any of the transaction related columns' value differs from the one in a previous, non-empty one. Those columns are Transaction ID, Date, Number, Description, Notes, Transaction Commodity and Void Reason.
 
 Lastly, for repeated imports the preview page has buttons to Load and Save the settings. You can save your adjusted settings to reuse them on later imports. After loading your settings you can also tweak them again for similar imports and save them under another name.</property>
         <property name="wrap">True</property>
@@ -416,7 +416,7 @@ There are two reserved names which can't be used to save custom settings:
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="icon-name">dialog-information</property>
-                            <property name="icon-size">3</property>
+                            <property name="icon_size">3</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -864,7 +864,7 @@ For example
                 <property name="halign">start</property>
                 <property name="valign">start</property>
                 <property name="icon-name">dialog-information</property>
-                <property name="icon-size">3</property>
+                <property name="icon_size">3</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1145,6 +1145,9 @@ More information can be displayed by using the help button.</property>
       <object class="GtkBox">
         <property name="can-focus">False</property>
       </object>
+      <packing>
+        <property name="has-padding">False</property>
+      </packing>
     </child>
   </object>
 </interface>



Summary of changes:
 gnucash/gtkbuilder/assistant-csv-trans-import.glade   | 11 +++++++----
 gnucash/import-export/csv-imp/test/test-tokenizer.cpp | 10 +++++-----
 gnucash/import-export/csv-imp/test/test-tx-import.cpp |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)