gnucash master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Mon Dec 19 16:18:58 EST 2022


Updated	 via  https://github.com/Gnucash/gnucash/commit/0421ff83 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d65f991e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/734f90bd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2c93c383 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b8c06735 (commit)



commit 0421ff834a7758e5431319b190783c9c51de4d60
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Oct 24 22:01:32 2022 +0200

    A few minor c++ tweaks regarding variables

diff --git a/gnucash/gnucash-core-app.cpp b/gnucash/gnucash-core-app.cpp
index 1bbdc03f8..69f7a5d08 100644
--- a/gnucash/gnucash-core-app.cpp
+++ b/gnucash/gnucash-core-app.cpp
@@ -65,9 +65,9 @@ static QofLogModule log_module = GNC_MOD_GUI;
 
 /* GNC_VCS is defined whenever we're building from an svn/svk/git/bzr tree */
 #ifdef GNC_VCS
-static int is_development_version = TRUE;
+constexpr int is_development_version = TRUE;
 #else
-static int is_development_version = FALSE;
+constexpr int is_development_version = FALSE;
 #define GNC_VCS ""
 #endif
 
diff --git a/gnucash/gnucash.cpp b/gnucash/gnucash.cpp
index e971a7d7b..76a26a52f 100644
--- a/gnucash/gnucash.cpp
+++ b/gnucash/gnucash.cpp
@@ -91,7 +91,6 @@ load_gnucash_plugins()
 static void
 load_gnucash_modules()
 {
-    int i, len;
     struct
     {
         const gchar * name;
@@ -105,8 +104,8 @@ load_gnucash_modules()
     };
 
     /* module initializations go here */
-    len = sizeof(modules) / sizeof(*modules);
-    for (i = 0; i < len; i++)
+    int len = sizeof(modules) / sizeof(*modules);
+    for (int i = 0; i < len; i++)
     {
         DEBUG("Loading module %s started", modules[i].name);
         gnc_update_splash_screen(modules[i].name, GNC_SPLASH_PERCENTAGE_UNKNOWN);
@@ -139,13 +138,10 @@ static void
 scm_run_gnucash (void *data, [[maybe_unused]] int argc, [[maybe_unused]] char **argv)
 {
     auto user_file_spec = static_cast<t_file_spec*>(data);
-    SCM main_mod;
-    char* fn = NULL;
-
 
     scm_c_eval_string("(debug-set! stack 200000)");
 
-    main_mod = scm_c_resolve_module("gnucash utilities");
+    auto main_mod = scm_c_resolve_module("gnucash utilities");
     scm_set_current_module(main_mod);
     scm_c_use_module("gnucash app-utils");
 
@@ -196,6 +192,7 @@ scm_run_gnucash (void *data, [[maybe_unused]] int argc, [[maybe_unused]] char **
 
     gnc_hook_run(HOOK_STARTUP, NULL);
 
+    char* fn = nullptr;
     if (!user_file_spec->nofile && (fn = get_file_to_load (user_file_spec->file_to_load)) && *fn )
     {
         auto msg = _("Loading data...");

commit d65f991e4b64c1b0ae545ab9c8b35ac4283047ab
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Oct 24 21:51:01 2022 +0200

    Drop help message for gtk options
    
    Gtk has deprecated their use and will be dropping them
    completely from Gtk 4. No need for us to continue to
    promote them.

diff --git a/gnucash/gnucash.cpp b/gnucash/gnucash.cpp
index 669f152fc..e971a7d7b 100644
--- a/gnucash/gnucash.cpp
+++ b/gnucash/gnucash.cpp
@@ -249,11 +249,6 @@ namespace Gnucash {
         void configure_program_options (void);
 
         bool m_nofile = false;
-        bool m_show_help_gtk = false;
-        bool m_add_quotes; // Deprecated will be removed in gnucash 5.0
-        boost::optional <std::string> m_namespace; // Deprecated will be removed in gnucash 5.0
-
-        std::string m_gtk_help_msg;
     };
 
 }
@@ -268,55 +263,20 @@ void
 Gnucash::Gnucash::parse_command_line (int argc, char **argv)
 {
     Gnucash::CoreApp::parse_command_line (argc, argv);
-
-    if (m_show_help_gtk)
-    {
-        std::cout << m_gtk_help_msg;
-        exit(0);
-    }
-
-    if (m_namespace)
-        gnc_prefs_set_namespace_regexp (m_namespace->c_str());
 }
 
 // Define command line options specific to gnucash.
 void
 Gnucash::Gnucash::configure_program_options (void)
 {
-    // The g_option context dance below is done to be able to show a help message
-    // for gtk's options. The options themselves are already parsed out by
-    // gtk_init_check by the time this function is called though. So it really only
-    // serves to be able to display a help message.
-    g_set_prgname (PROJECT_NAME);
-    auto context = g_option_context_new (m_tagline.c_str());
-    auto gtk_options = gtk_get_option_group(FALSE);
-    g_option_context_add_group (context, gtk_options);
-
-    auto help_cstr = g_option_context_get_help (context, FALSE, gtk_options);
-    m_gtk_help_msg = help_cstr;
-    g_free (help_cstr);
-    g_option_context_free (context);
 
     bpo::options_description app_options(_("Application Options"));
     app_options.add_options()
     ("nofile", bpo::bool_switch (&m_nofile),
-     _("Do not load the last file opened"))
-    ("help-gtk",  bpo::bool_switch (&m_show_help_gtk),
-     _("Show help for gtk options"));
-
-    bpo::options_description depr_options(_("Deprecated Options"));
-    depr_options.add_options()
-    ("add-price-quotes", bpo::bool_switch (&m_add_quotes),
-     _("Add price quotes to given GnuCash datafile.\n"
-        "Note this option has been deprecated and will be removed in GnuCash 5.0.\n"
-        "Please use 'gnucash-cli --quotes get <datafile>' instead."))
-    ("namespace", bpo::value (&m_namespace),
-     _("Regular expression determining which namespace commodities will be retrieved.\n"
-       "Note this option has been deprecated and will be removed in GnuCash 5.0.\n"
-       "Please use 'gnucash-cli --quotes get --namespace <namespace> <datafile>' instead."));
-
-    m_opt_desc_display->add (app_options).add (depr_options);
-    m_opt_desc_all.add (app_options).add (depr_options);
+     _("Do not load the last file opened"));
+
+    m_opt_desc_display->add (app_options);
+    m_opt_desc_all.add (app_options);
 }
 
 int
@@ -324,22 +284,6 @@ Gnucash::Gnucash::start ([[maybe_unused]] int argc, [[maybe_unused]] char **argv
 {
     Gnucash::CoreApp::start();
 
-    // Test for the deprecated add-price-quotes option and run it
-    // Will be removed in 5.0
-    if (m_add_quotes)
-    {
-        std::cerr << _("The '--add-price-quotes' option to gnucash has been deprecated and will be removed in GnuCash 5.0. "
-                       "Please use 'gnucash-cli --quotes get <datafile>' instead.") << "\n";
-        if (!m_file_to_load || m_file_to_load->empty())
-        {
-            std::cerr << _("Missing data file parameter") << "\n\n"
-            << *m_opt_desc_display.get();
-            return 1;
-        }
-        else
-            return add_quotes (m_file_to_load);
-    }
-
     /* Now the module files are looked up, which might cause some library
      initialization to be run, hence gtk must be initialized b*eforehand. */
     gnc_module_system_init();

commit 734f90bd36f520c0d08f37a5cf5e0fb08f96b152
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Oct 24 21:41:08 2022 +0200

    Replace string literal 'gnucash' with PROJECT_NAME parameter where it makes sense
    
    The idea behind this is to not assume the project is always built
    as "gnucash" exactly.
    One example where it can be useful to use a different project name
    would be when building multiple development versions of the project
    on the same system and don't want these different versions share
    the same settings in GSettings or the same stored passwords.

diff --git a/gnucash/gnome-utils/dialog-file-access.c b/gnucash/gnome-utils/dialog-file-access.c
index 50f5b4f13..2082df65e 100644
--- a/gnucash/gnome-utils/dialog-file-access.c
+++ b/gnucash/gnome-utils/dialog-file-access.c
@@ -39,7 +39,7 @@
 static QofLogModule log_module = GNC_MOD_GUI;
 
 #define DEFAULT_HOST "localhost"
-#define DEFAULT_DATABASE "gnucash"
+#define DEFAULT_DATABASE PROJECT_NAME
 #define FILE_ACCESS_OPEN    0
 #define FILE_ACCESS_SAVE_AS 1
 #define FILE_ACCESS_EXPORT  2
diff --git a/gnucash/gnome-utils/gnc-keyring.c b/gnucash/gnome-utils/gnc-keyring.c
index 99d5b9c3c..4bb72d949 100644
--- a/gnucash/gnome-utils/gnc-keyring.c
+++ b/gnucash/gnome-utils/gnc-keyring.c
@@ -200,14 +200,14 @@ gboolean gnc_keyring_get_password ( GtkWidget *parent,
      * referenced above. */
     secret_password_store_sync (SECRET_SCHEMA_GNUCASH, SECRET_COLLECTION_DEFAULT,
                                 "Dummy password", "dummy", NULL, &error,
-                                "protocol", "gnucash",
-                                "server", "gnucash",
-                                "user", "gnucash",
+                                "protocol", PROJECT_NAME,
+                                "server", PROJECT_NAME,
+                                "user", PROJECT_NAME,
                                 NULL);
     secret_password_clear_sync (SECRET_SCHEMA_GNUCASH, NULL, &error,
-                                "protocol", "gnucash",
-                                "server", "gnucash",
-                                "user", "gnucash",
+                                "protocol", PROJECT_NAME,
+                                "server", PROJECT_NAME,
+                                "user", PROJECT_NAME,
                                 NULL);
 
     /* Note: only use the port attribute if it  was set by the user. */
diff --git a/gnucash/gnucash-cli.cpp b/gnucash/gnucash-cli.cpp
index f81cc3cca..edcf33d6c 100644
--- a/gnucash/gnucash-cli.cpp
+++ b/gnucash/gnucash-cli.cpp
@@ -226,7 +226,8 @@ Gnucash::GnucashCli::start ([[maybe_unused]] int argc, [[maybe_unused]] char **a
 int
 main(int argc, char **argv)
 {
-    Gnucash::GnucashCli application (argv[0]);
+    const char *app_name = PROJECT_NAME "-cli";
+    Gnucash::GnucashCli application (app_name);
 #ifdef __MINGW32__
     boost::nowide::args a(argc, argv); // Fix arguments - make them UTF-8
 #endif
diff --git a/gnucash/gnucash.cpp b/gnucash/gnucash.cpp
index ddaa09a47..669f152fc 100644
--- a/gnucash/gnucash.cpp
+++ b/gnucash/gnucash.cpp
@@ -287,7 +287,7 @@ Gnucash::Gnucash::configure_program_options (void)
     // for gtk's options. The options themselves are already parsed out by
     // gtk_init_check by the time this function is called though. So it really only
     // serves to be able to display a help message.
-    g_set_prgname ("gnucash");
+    g_set_prgname (PROJECT_NAME);
     auto context = g_option_context_new (m_tagline.c_str());
     auto gtk_options = gtk_get_option_group(FALSE);
     g_option_context_add_group (context, gtk_options);
@@ -357,7 +357,7 @@ Gnucash::Gnucash::start ([[maybe_unused]] int argc, [[maybe_unused]] char **argv
 int
 main(int argc, char ** argv)
 {
-    Gnucash::Gnucash application (argv[0]);
+    Gnucash::Gnucash application (PROJECT_NAME);
 #ifdef __MINGW32__
     boost::nowide::args a(argc, argv); // Fix arguments - make them UTF-8
 #endif
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index 861edc080..e9727ff23 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -176,7 +176,7 @@ gnc_AB_BANKING_new (void)
     }
     else
     {
-        api = AB_Banking_new ("gnucash", NULL, 0);
+        api = AB_Banking_new (PROJECT_NAME, NULL, 0);
         g_return_val_if_fail (api, NULL);
 
         /* These two values must be set because newest bank regulation requires
diff --git a/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp b/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
index b23e69a33..75a86ed74 100644
--- a/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+++ b/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
@@ -233,7 +233,7 @@ setup_business (Fixture* fixture, gconstpointer pData)
 
     emp = gncEmployeeCreate (book);
     gncEmployeeSetID (emp, "0001");
-    gncEmployeeSetUsername (emp, "gnucash");
+    gncEmployeeSetUsername (emp, PROJECT_NAME);
     gncEmployeeSetLanguage (emp, "english");
     gncEmployeeSetCurrency (emp, currency);
 
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index eb362a4c2..99adef279 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -69,7 +69,7 @@ gchar *gnc_path_get_datadir()
 gchar *gnc_path_get_pkgdatadir()
 {
     gchar *datadir = gnc_gbr_find_data_dir (DATADIR);
-    gchar *result = g_build_filename (datadir, "gnucash", (char*)NULL);
+    gchar *result = g_build_filename (datadir, PROJECT_NAME, (char*)NULL);
     g_free (datadir);
     //printf("Returning pkgdatadir %s\n", result);
     return result;
@@ -82,7 +82,7 @@ gchar *gnc_path_get_pkgdatadir()
 gchar *gnc_path_get_pkgdocdir()
 {
     gchar *docdir = gnc_gbr_find_data_dir (DATADIR);
-    gchar *result = g_build_filename (docdir, "doc", "gnucash", (char*)NULL);
+    gchar *result = g_build_filename (docdir, "doc", PROJECT_NAME, (char*)NULL);
     g_free (docdir);
     //printf("Returning pkgdocdir %s\n", result);
     return result;
@@ -95,7 +95,7 @@ gchar *gnc_path_get_pkgdocdir()
 gchar *gnc_path_get_pkgsysconfdir()
 {
     gchar *sysconfdir = gnc_gbr_find_etc_dir (SYSCONFDIR);
-    gchar *result = g_build_filename (sysconfdir, "gnucash", (char*)NULL);
+    gchar *result = g_build_filename (sysconfdir, PROJECT_NAME, (char*)NULL);
     g_free (sysconfdir);
     //printf("Returning pkgsysconfdir %s\n", result);
     return result;
@@ -113,7 +113,7 @@ gchar *gnc_path_get_pkglibdir()
     /* Workaround for Bug 618646, {pkglibdir} will be bin/ on Windows */
     gchar *result = gnc_gbr_find_bin_dir(libdir);
 #else
-    gchar *result = g_build_filename (libdir, "gnucash", (char*)NULL);
+    gchar *result = g_build_filename (libdir, PROJECT_NAME, (char*)NULL);
 #endif
     g_free (libdir);
     //printf("Returning pkglibdir %s\n", result);
@@ -192,7 +192,7 @@ gchar *gnc_path_get_scmdir()
 gchar *gnc_path_get_reportdir()
 {
     gchar *scmdir = gnc_path_get_scmdir ();
-    gchar *result = g_build_filename (scmdir, "gnucash", "report", (char*)NULL);
+    gchar *result = g_build_filename (scmdir, PROJECT_NAME, "report", (char*)NULL);
     g_free (scmdir);
 
     return result;
@@ -205,7 +205,7 @@ gchar *gnc_path_get_reportdir()
 gchar *gnc_path_get_reportsdir()
 {
     gchar *scmdir = gnc_path_get_scmdir ();
-    gchar *result = g_build_filename (scmdir, "gnucash", "reports", NULL);
+    gchar *result = g_build_filename (scmdir, PROJECT_NAME, "reports", NULL);
     g_free (scmdir);
     //printf("Returning reportsdir %s\n", result);
     return result;
diff --git a/libgnucash/core-utils/test/gtest-path-utilities.cpp b/libgnucash/core-utils/test/gtest-path-utilities.cpp
index d7210007b..90e1240ee 100644
--- a/libgnucash/core-utils/test/gtest-path-utilities.cpp
+++ b/libgnucash/core-utils/test/gtest-path-utilities.cpp
@@ -107,7 +107,7 @@ TEST_F(PathTest, gnc_path_get_datadir)
 TEST_F(PathTest, gnc_path_get_sysconfdir)
 {
     gchar *dirname = gnc_file_path_relative_part(PREFIX, SYSCONFDIR);
-    gchar *sysconfpath = g_build_filename(m_prefix, dirname, "gnucash", NULL);
+    gchar *sysconfpath = g_build_filename(m_prefix, dirname, PROJECT_NAME, NULL);
     g_free(dirname);
 #ifdef ENABLE_BINRELOC
     EXPECT_STREQ(gnc_path_get_pkgsysconfdir(), sysconfpath);
@@ -119,7 +119,7 @@ TEST_F(PathTest, gnc_path_get_sysconfdir)
     g_free(sysconfpath);
     g_unsetenv("GNC_UNINSTALLED");
     g_unsetenv("GNC_BUILDDIR");
-    sysconfpath = g_build_filename(SYSCONFDIR, "gnucash", NULL);
+    sysconfpath = g_build_filename(SYSCONFDIR, PROJECT_NAME, NULL);
     EXPECT_STREQ(gnc_path_get_pkgsysconfdir(), sysconfpath);
     g_free(sysconfpath);
 #endif

commit 2c93c383ac7dbd7ec4ae31104b836d5dcd78d1a0
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Oct 20 14:19:24 2022 +0200

    Change remaining references to 'help' into 'manual'
    
    In addition, change the prefixes for all documentation related macros:
    - HL_ ('help link') -> DL_ ('documentation link')
    - HF_ ('help files') -> DF_ ('documentation files')

diff --git a/gnucash/gnome-search/dialog-search.c b/gnucash/gnome-search/dialog-search.c
index a7f1bdc32..4804f202f 100644
--- a/gnucash/gnome-search/dialog-search.c
+++ b/gnucash/gnome-search/dialog-search.c
@@ -656,7 +656,7 @@ search_cancel_cb (GtkButton *button, GNCSearchWindow *sw)
 static void
 search_help_cb (GtkButton *button, GNCSearchWindow *sw)
 {
-    gnc_gnome_help (GTK_WINDOW(sw->dialog), HF_HELP, HL_FIND_TRANSACTIONS);
+    gnc_gnome_help (GTK_WINDOW(sw->dialog), DF_MANUAL, DL_FIND_TRANSACTIONS);
 }
 
 static void
diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index 63ab3808a..3437188d6 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -1009,11 +1009,11 @@ gnc_account_window_response_cb (GtkDialog *dialog,
         {
         case NEW_ACCOUNT:
             DEBUG("new acct dialog, HELP");
-            gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_ACC);
+            gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_ACC);
             break;
         case EDIT_ACCOUNT:
             DEBUG("edit acct dialog, HELP");
-            gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_ACCEDIT);
+            gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_ACCEDIT);
             break;
         default:
             g_assert_not_reached ();
diff --git a/gnucash/gnome-utils/dialog-book-close.c b/gnucash/gnome-utils/dialog-book-close.c
index 147ab6c0c..bb4480b48 100644
--- a/gnucash/gnome-utils/dialog-book-close.c
+++ b/gnucash/gnome-utils/dialog-book-close.c
@@ -279,7 +279,7 @@ gnc_book_close_response_cb(GtkDialog *dialog, gint response, GtkDialog *unused)
     switch (response)
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_CLOSE_BOOK);
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_CLOSE_BOOK);
         break;
     case GTK_RESPONSE_OK:
         cbw->close_date = gnc_date_edit_get_date(GNC_DATE_EDIT(cbw->close_date_widget));
diff --git a/gnucash/gnome-utils/dialog-commodity.c b/gnucash/gnome-utils/dialog-commodity.c
index e5474c380..7aa5ea705 100644
--- a/gnucash/gnome-utils/dialog-commodity.c
+++ b/gnucash/gnome-utils/dialog-commodity.c
@@ -1140,7 +1140,7 @@ gnc_ui_common_commodity_modal(gnc_commodity *commodity,
             break;
         case GTK_RESPONSE_HELP:
             DEBUG("case HELP");
-            gnc_gnome_help (GTK_WINDOW(win->dialog), HF_HELP, HL_COMMODITY);
+            gnc_gnome_help (GTK_WINDOW(win->dialog), DF_MANUAL, DL_COMMODITY);
             break;
         default:	/* Cancel, Escape, Close, etc. */
             DEBUG("default: %d", value);
diff --git a/gnucash/gnome-utils/dialog-file-access.c b/gnucash/gnome-utils/dialog-file-access.c
index 8fc898ecc..50f5b4f13 100644
--- a/gnucash/gnome-utils/dialog-file-access.c
+++ b/gnucash/gnome-utils/dialog-file-access.c
@@ -125,7 +125,7 @@ gnc_ui_file_access_response_cb(GtkDialog *dialog, gint response, GtkDialog *unus
     switch ( response )
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_GLOBPREFS );
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_GLOBPREFS );
         break;
 
     case GTK_RESPONSE_OK:
diff --git a/gnucash/gnome-utils/dialog-options.cpp b/gnucash/gnome-utils/dialog-options.cpp
index 062a8b5bb..3293b5a5a 100644
--- a/gnucash/gnome-utils/dialog-options.cpp
+++ b/gnucash/gnome-utils/dialog-options.cpp
@@ -42,7 +42,7 @@ extern "C"
 #include "gnc-component-manager.h"
 #include <gnc-prefs.h> // for GNC_PREFS_NUM_SOURCE
 #include "gnc-session.h" // for gnc_get_current_session
-#include "gnc-ui.h" // for HF_HELP
+#include "gnc-ui.h" // for DF_MANUAL
 }
 
 #include <iostream>
@@ -646,7 +646,7 @@ GncOptionsDialog::set_close_cb( GncOptionsDialogCallback cb, gpointer data) noex
 static void
 gnc_book_options_help_cb (GncOptionsDialog *win, gpointer dat)
 {
-    gnc_gnome_help (GTK_WINDOW (win->get_widget()), HF_HELP, HL_BOOK_OPTIONS);
+    gnc_gnome_help (GTK_WINDOW (win->get_widget()), DF_MANUAL, DL_BOOK_OPTIONS);
 }
 
 void
@@ -658,13 +658,13 @@ GncOptionsDialog::set_book_help_cb() noexcept
 static void
 gnc_global_options_help_cb (GncOptionsDialog *win, gpointer dat)
 {
-    gnc_gnome_help (GTK_WINDOW(win->get_widget()), HF_HELP, HL_GLOBPREFS);
+    gnc_gnome_help (GTK_WINDOW(win->get_widget()), DF_MANUAL, DL_GLOBPREFS);
 }
 
 static void
 gnc_style_sheet_options_help_cb (GncOptionsDialog *win, gpointer dat)
 {
-    gnc_gnome_help (GTK_WINDOW(win->get_widget()), HF_HELP, HL_STYLE_SHEET);
+    gnc_gnome_help (GTK_WINDOW(win->get_widget()), DF_MANUAL, DL_STYLE_SHEET);
 }
 
 void
diff --git a/gnucash/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
index ae1452479..c24eee64e 100644
--- a/gnucash/gnome-utils/dialog-preferences.c
+++ b/gnucash/gnome-utils/dialog-preferences.c
@@ -1202,7 +1202,7 @@ gnc_preferences_response_cb (GtkDialog *dialog, gint response, GtkDialog *unused
     switch (response)
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_GLOBPREFS);
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_GLOBPREFS);
         break;
 
     case GTK_RESPONSE_DELETE_EVENT:
diff --git a/gnucash/gnome-utils/gnc-main-window.cpp b/gnucash/gnome-utils/gnc-main-window.cpp
index f0b50e6a1..90c6b5389 100644
--- a/gnucash/gnome-utils/gnc-main-window.cpp
+++ b/gnucash/gnome-utils/gnc-main-window.cpp
@@ -4746,13 +4746,13 @@ gnc_main_window_cmd_window_raise (GtkAction *action,
 static void
 gnc_main_window_cmd_help_tutorial (GtkAction *action, GncMainWindow *window)
 {
-    gnc_gnome_help (GTK_WINDOW(window), HF_GUIDE, NULL);
+    gnc_gnome_help (GTK_WINDOW(window), DF_GUIDE, NULL);
 }
 
 static void
 gnc_main_window_cmd_help_contents (GtkAction *action, GncMainWindow *window)
 {
-    gnc_gnome_help (GTK_WINDOW(window), HF_HELP, NULL);
+    gnc_gnome_help (GTK_WINDOW(window), DF_MANUAL, NULL);
 }
 
 /** This is a helper function to find a data file and suck it into
diff --git a/gnucash/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h
index e00c853ff..1473f5944 100644
--- a/gnucash/gnome-utils/gnc-ui.h
+++ b/gnucash/gnome-utils/gnc-ui.h
@@ -23,7 +23,7 @@
     @{ */
 
 /** @defgroup Dialogs Dialogs */
-/** @defgroup Druids Druids */
+/** @defgroup Assistants Assistants */
 
 /** @} */
 
@@ -38,45 +38,45 @@
 #include <gtk/gtk.h>
 
 
-/** Help Files ******************************************************/
+/** Documentation references ****************************************/
 #ifdef G_OS_WIN32
-#    define HF_GUIDE         "gnucash-guide.chm"
-#    define HF_HELP          "gnucash-manual.chm"
+#    define DF_GUIDE         "gnucash-guide.chm"
+#    define DF_MANUAL        "gnucash-manual.chm"
 #elif defined MAC_INTEGRATION
-#    define HF_GUIDE         "GnuCash Guide"
-#    define HF_HELP          "GnuCash Manual"
+#    define DF_GUIDE         "GnuCash Guide"
+#    define DF_MANUAL        "GnuCash Manual"
 #else
-#    define HF_GUIDE         "gnucash-guide"
-#    define HF_HELP          "gnucash-manual"
+#    define DF_GUIDE         "gnucash-guide"
+#    define DF_MANUAL        "gnucash-manual"
 #endif
 
-/** Links in the Help Files *****************************************/
-#define HL_USAGE_BSNSS       "busnss-ar-setup1"
-#define HL_USAGE_INVOICE     "busnss-ar-invoices1"
-#define HL_USAGE_VOUCHER     "busnss-emply-newvchr"
-#define HL_USAGE_BILL        "busnss-ap-bills1"
-#define HL_USAGE_CUSTOMER    "busnss-ar-customers1"
-#define HL_USAGE_VENDOR      "busnss-ap-vendors1"
-#define HL_USAGE_EMPLOYEE    "busnss-emply"
-#define HL_USAGE_JOB         "busnss-ar-jobs1"
-#define HL_ACC               "acct-create"
-#define HL_ACCEDIT           "acct-edit"
-#define HL_COMMODITY         "tool-commodity"
-#define HL_FIND_TRANSACTIONS "tool-find"
-#define HL_FIN_CALC          "tool-calc"
-#define HL_PRICE_DB          "tool-price"
-#define HL_PRICE_EDIT        "tool-price-manual"
-#define HL_GLOBPREFS         "set-prefs"
-#define HL_PRINTCHECK        "print-check"
-#define HL_RECNWIN           "acct-reconcile"
-#define HL_SXEDITOR          "trans-sched"
-#define HL_SX_SLR            "trans-sched-slr"
-#define HL_BOOK_OPTIONS      "book-options"
-#define HL_STYLE_SHEET       "change-style"
-#define HL_CLOSE_BOOK        "tool-close-book"
-#define HL_USAGE_CUSTOMREP   "report-saving"
-#define HL_IMPORT_BC         "busnss-imp-bills-invoices"
-#define HL_IMPORT_CUST       "busnss-imp-customer-vendor"
+/** Links in the Manual *********************************************/
+#define DL_USAGE_BSNSS       "busnss-ar-setup1"
+#define DL_USAGE_INVOICE     "busnss-ar-invoices1"
+#define DL_USAGE_VOUCHER     "busnss-emply-newvchr"
+#define DL_USAGE_BILL        "busnss-ap-bills1"
+#define DL_USAGE_CUSTOMER    "busnss-ar-customers1"
+#define DL_USAGE_VENDOR      "busnss-ap-vendors1"
+#define DL_USAGE_EMPLOYEE    "busnss-emply"
+#define DL_USAGE_JOB         "busnss-ar-jobs1"
+#define DL_ACC               "acct-create"
+#define DL_ACCEDIT           "acct-edit"
+#define DL_COMMODITY         "tool-commodity"
+#define DL_FIND_TRANSACTIONS "tool-find"
+#define DL_FIN_CALC          "tool-calc"
+#define DL_PRICE_DB          "tool-price"
+#define DL_PRICE_EDIT        "tool-price-manual"
+#define DL_GLOBPREFS         "set-prefs"
+#define DL_PRINTCHECK        "print-check"
+#define DL_RECNWIN           "acct-reconcile"
+#define DL_SXEDITOR          "trans-sched"
+#define DL_SX_SLR            "trans-sched-slr"
+#define DL_BOOK_OPTIONS      "book-options"
+#define DL_STYLE_SHEET       "change-style"
+#define DL_CLOSE_BOOK        "tool-close-book"
+#define DL_USAGE_CUSTOMREP   "report-saving"
+#define DL_IMPORT_BC         "busnss-imp-bills-invoices"
+#define DL_IMPORT_CUST       "busnss-imp-customer-vendor"
 
 /* GTK Windows - Common Response Codes */
 
diff --git a/gnucash/gnome/dialog-custom-report.c b/gnucash/gnome/dialog-custom-report.c
index 7f72ef563..6a58d5be5 100644
--- a/gnucash/gnome/dialog-custom-report.c
+++ b/gnucash/gnome/dialog-custom-report.c
@@ -131,7 +131,7 @@ void
 custom_report_help_cb (GtkWidget *widget, gpointer data)
 {
     CustomReportDialog *crd = data;
-    gnc_gnome_help (GTK_WINDOW(crd->dialog), HF_HELP, HL_USAGE_CUSTOMREP);
+    gnc_gnome_help (GTK_WINDOW(crd->dialog), DF_MANUAL, DL_USAGE_CUSTOMREP);
 }
 
 void
diff --git a/gnucash/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
index 3fe6650dd..c5c308542 100644
--- a/gnucash/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -368,7 +368,7 @@ void
 gnc_customer_window_help_cb (GtkWidget *widget, gpointer data)
 {
     CustomerWindow *cw = data;
-    gnc_gnome_help (GTK_WINDOW(cw->dialog), HF_HELP, HL_USAGE_CUSTOMER);
+    gnc_gnome_help (GTK_WINDOW(cw->dialog), DF_MANUAL, DL_USAGE_CUSTOMER);
 }
 
 void
diff --git a/gnucash/gnome/dialog-employee.c b/gnucash/gnome/dialog-employee.c
index e4f02dfa1..a43f513ea 100644
--- a/gnucash/gnome/dialog-employee.c
+++ b/gnucash/gnome/dialog-employee.c
@@ -250,7 +250,7 @@ void
 gnc_employee_window_help_cb (GtkWidget *widget, gpointer data)
 {
     EmployeeWindow *ew = data;
-    gnc_gnome_help (GTK_WINDOW(ew->dialog), HF_HELP, HL_USAGE_EMPLOYEE);
+    gnc_gnome_help (GTK_WINDOW(ew->dialog), DF_MANUAL, DL_USAGE_EMPLOYEE);
 }
 
 void
diff --git a/gnucash/gnome/dialog-fincalc.c b/gnucash/gnome/dialog-fincalc.c
index 2019dc86d..db6c3a5cc 100644
--- a/gnucash/gnome/dialog-fincalc.c
+++ b/gnucash/gnome/dialog-fincalc.c
@@ -497,7 +497,7 @@ void fincalc_response_cb (GtkDialog *dialog,
     switch (response)
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_FIN_CALC);
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_FIN_CALC);
         return;
 
     case GTK_RESPONSE_OK:
diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index 8307cec9f..b43ee98f1 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -549,13 +549,13 @@ gnc_invoice_window_help_cb (GtkWidget *widget, gpointer data)
     switch(owner_type)
     {
         case GNC_OWNER_CUSTOMER:
-           gnc_gnome_help (GTK_WINDOW(iw->dialog), HF_HELP, HL_USAGE_INVOICE);
+           gnc_gnome_help (GTK_WINDOW(iw->dialog), DF_MANUAL, DL_USAGE_INVOICE);
            break;
         case GNC_OWNER_VENDOR:
-           gnc_gnome_help (GTK_WINDOW(iw->dialog), HF_HELP, HL_USAGE_BILL);
+           gnc_gnome_help (GTK_WINDOW(iw->dialog), DF_MANUAL, DL_USAGE_BILL);
            break;
         default:
-           gnc_gnome_help (GTK_WINDOW(iw->dialog), HF_HELP, HL_USAGE_VOUCHER);
+           gnc_gnome_help (GTK_WINDOW(iw->dialog), DF_MANUAL, DL_USAGE_VOUCHER);
            break;
     }
 }
diff --git a/gnucash/gnome/dialog-job.c b/gnucash/gnome/dialog-job.c
index 5be6ec0ed..f78cf005e 100644
--- a/gnucash/gnome/dialog-job.c
+++ b/gnucash/gnome/dialog-job.c
@@ -208,7 +208,7 @@ void
 gnc_job_window_help_cb (GtkWidget *widget, gpointer data)
 {
     JobWindow *jw = data;
-    gnc_gnome_help (GTK_WINDOW(jw->dialog), HF_HELP, HL_USAGE_JOB);
+    gnc_gnome_help (GTK_WINDOW(jw->dialog), DF_MANUAL, DL_USAGE_JOB);
 }
 
 
diff --git a/gnucash/gnome/dialog-new-user.c b/gnucash/gnome/dialog-new-user.c
index 234566155..b9342760b 100644
--- a/gnucash/gnome/dialog-new-user.c
+++ b/gnucash/gnome/dialog-new-user.c
@@ -122,7 +122,7 @@ gnc_ui_new_user_ok_cb (GtkWidget * widget, gpointer data)
     }
     else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (new_user->tutorial_button)))
     {
-        gnc_gnome_help (GTK_WINDOW(new_user->window), HF_GUIDE, NULL);
+        gnc_gnome_help (GTK_WINDOW(new_user->window), DF_GUIDE, NULL);
     }
     gtk_widget_destroy (new_user->window);
 }
diff --git a/gnucash/gnome/dialog-order.c b/gnucash/gnome/dialog-order.c
index f1e0ed219..ac4022b7c 100644
--- a/gnucash/gnome/dialog-order.c
+++ b/gnucash/gnome/dialog-order.c
@@ -231,7 +231,7 @@ void
 gnc_order_window_help_cb (GtkWidget *widget, gpointer data)
 {
     OrderWindow *ow = data;
-    gnc_gnome_help (GTK_WINDOW(ow->dialog), HF_HELP, HL_USAGE_BILL);
+    gnc_gnome_help (GTK_WINDOW(ow->dialog), DF_MANUAL, DL_USAGE_BILL);
 }
 
 void
diff --git a/gnucash/gnome/dialog-price-edit-db.cpp b/gnucash/gnome/dialog-price-edit-db.cpp
index bb877753c..beee0995e 100644
--- a/gnucash/gnome/dialog-price-edit-db.cpp
+++ b/gnucash/gnome/dialog-price-edit-db.cpp
@@ -141,7 +141,7 @@ gnc_prices_dialog_help_cb (GtkDialog *dialog, gpointer data)
 {
     auto pdb_dialog{static_cast<PricesDialog*>(data)};
 
-    gnc_gnome_help (GTK_WINDOW (pdb_dialog->window), HF_HELP, HL_PRICE_DB);
+    gnc_gnome_help (GTK_WINDOW (pdb_dialog->window), DF_MANUAL, DL_PRICE_DB);
 }
 
 
diff --git a/gnucash/gnome/dialog-price-editor.c b/gnucash/gnome/dialog-price-editor.c
index 6b36c6702..9d0d89aa7 100644
--- a/gnucash/gnome/dialog-price-editor.c
+++ b/gnucash/gnome/dialog-price-editor.c
@@ -374,7 +374,7 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
     }
     else if (response == GTK_RESPONSE_HELP)
     {
-        gnc_gnome_help (GTK_WINDOW (pedit_dialog->dialog), HF_HELP, HL_PRICE_EDIT);
+        gnc_gnome_help (GTK_WINDOW (pedit_dialog->dialog), DF_MANUAL, DL_PRICE_EDIT);
     }
     else
     {
diff --git a/gnucash/gnome/dialog-print-check.c b/gnucash/gnome/dialog-print-check.c
index c2b90da08..684030bab 100644
--- a/gnucash/gnome/dialog-print-check.c
+++ b/gnucash/gnome/dialog-print-check.c
@@ -2676,7 +2676,7 @@ gnc_ui_print_check_response_cb(GtkDialog *dialog,
     switch (response)
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_PRINTCHECK);
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_PRINTCHECK);
         return;
 
     case GTK_RESPONSE_OK:
diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index cfe19a712..0f2e027cb 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -230,7 +230,7 @@ editor_cancel_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
 static void
 editor_help_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
 {
-    gnc_gnome_help (GTK_WINDOW (sxed->dialog), HF_HELP, HL_SXEDITOR);
+    gnc_gnome_help (GTK_WINDOW (sxed->dialog), DF_MANUAL, DL_SXEDITOR);
 }
 
 
diff --git a/gnucash/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
index 8eff1ca52..63f0d3e7c 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.c
+++ b/gnucash/gnome/dialog-sx-since-last-run.c
@@ -1127,7 +1127,7 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog
     switch (response_id)
     {
     case GTK_RESPONSE_HELP:
-        gnc_gnome_help (GTK_WINDOW(dialog), HF_HELP, HL_SX_SLR);
+        gnc_gnome_help (GTK_WINDOW(dialog), DF_MANUAL, DL_SX_SLR);
         break;
 
     case GTK_RESPONSE_OK:
diff --git a/gnucash/gnome/dialog-vendor.c b/gnucash/gnome/dialog-vendor.c
index f0882281f..990a1a2a3 100644
--- a/gnucash/gnome/dialog-vendor.c
+++ b/gnucash/gnome/dialog-vendor.c
@@ -239,7 +239,7 @@ void
 gnc_vendor_window_help_cb (GtkWidget *widget, gpointer data)
 {
     VendorWindow *vw = data;
-    gnc_gnome_help (GTK_WINDOW(vw->dialog), HF_HELP, HL_USAGE_VENDOR);
+    gnc_gnome_help (GTK_WINDOW(vw->dialog), DF_MANUAL, DL_USAGE_VENDOR);
 }
 
 void
diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index a76b347bf..bf1a41b80 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -1199,7 +1199,7 @@ static void
 gnc_ui_reconcile_window_help_cb(GtkWidget *widget, gpointer data)
 {
     RecnWindow *recnData = data;
-    gnc_gnome_help (GTK_WINDOW(recnData->window), HF_HELP, HL_RECNWIN);
+    gnc_gnome_help (GTK_WINDOW(recnData->window), DF_MANUAL, DL_RECNWIN);
 }
 
 
diff --git a/gnucash/import-export/bi-import/dialog-bi-import-gui.c b/gnucash/import-export/bi-import/dialog-bi-import-gui.c
index 7dd065291..cf7c3a5e1 100644
--- a/gnucash/import-export/bi-import/dialog-bi-import-gui.c
+++ b/gnucash/import-export/bi-import/dialog-bi-import-gui.c
@@ -249,7 +249,7 @@ void
 gnc_bi_import_gui_help_cb (GtkWidget *widget, gpointer data)
 {
     BillImportGui *gui = data;
-    gnc_gnome_help (GTK_WINDOW(gui->dialog), HF_GUIDE, HL_IMPORT_BC);
+    gnc_gnome_help (GTK_WINDOW(gui->dialog), DF_GUIDE, DL_IMPORT_BC);
 }
 
 static void
diff --git a/gnucash/import-export/customer-import/dialog-customer-import-gui.c b/gnucash/import-export/customer-import/dialog-customer-import-gui.c
index 1fd461b62..4c4761299 100644
--- a/gnucash/import-export/customer-import/dialog-customer-import-gui.c
+++ b/gnucash/import-export/customer-import/dialog-customer-import-gui.c
@@ -225,7 +225,7 @@ void
 gnc_customer_import_gui_help_cb (GtkWidget *widget, gpointer data)
 {
     CustomerImportGui *gui = data;
-    gnc_gnome_help (GTK_WINDOW(gui->dialog), HF_GUIDE, HL_IMPORT_CUST);
+    gnc_gnome_help (GTK_WINDOW(gui->dialog), DF_GUIDE, DL_IMPORT_CUST);
 }
 
 static void



Summary of changes:
 gnucash/gnome-search/dialog-search.c               |  2 +-
 gnucash/gnome-utils/dialog-account.c               |  4 +-
 gnucash/gnome-utils/dialog-book-close.c            |  2 +-
 gnucash/gnome-utils/dialog-commodity.c             |  2 +-
 gnucash/gnome-utils/dialog-file-access.c           |  4 +-
 gnucash/gnome-utils/dialog-options.cpp             |  8 +--
 gnucash/gnome-utils/dialog-preferences.c           |  2 +-
 gnucash/gnome-utils/gnc-keyring.c                  | 12 ++--
 gnucash/gnome-utils/gnc-main-window.cpp            |  4 +-
 gnucash/gnome-utils/gnc-ui.h                       | 70 ++++++++++----------
 gnucash/gnome/dialog-custom-report.c               |  2 +-
 gnucash/gnome/dialog-customer.c                    |  2 +-
 gnucash/gnome/dialog-employee.c                    |  2 +-
 gnucash/gnome/dialog-fincalc.c                     |  2 +-
 gnucash/gnome/dialog-invoice.c                     |  6 +-
 gnucash/gnome/dialog-job.c                         |  2 +-
 gnucash/gnome/dialog-new-user.c                    |  2 +-
 gnucash/gnome/dialog-order.c                       |  2 +-
 gnucash/gnome/dialog-price-edit-db.cpp             |  2 +-
 gnucash/gnome/dialog-price-editor.c                |  2 +-
 gnucash/gnome/dialog-print-check.c                 |  2 +-
 gnucash/gnome/dialog-sx-editor.c                   |  2 +-
 gnucash/gnome/dialog-sx-since-last-run.c           |  2 +-
 gnucash/gnome/dialog-vendor.c                      |  2 +-
 gnucash/gnome/window-reconcile.c                   |  2 +-
 gnucash/gnucash-cli.cpp                            |  3 +-
 gnucash/gnucash-core-app.cpp                       |  4 +-
 gnucash/gnucash.cpp                                | 77 +++-------------------
 gnucash/import-export/aqb/gnc-ab-utils.c           |  2 +-
 .../import-export/bi-import/dialog-bi-import-gui.c |  2 +-
 .../customer-import/dialog-customer-import-gui.c   |  2 +-
 .../backend/dbi/test/test-backend-dbi-basic.cpp    |  2 +-
 libgnucash/core-utils/gnc-path.c                   | 12 ++--
 .../core-utils/test/gtest-path-utilities.cpp       |  4 +-
 34 files changed, 97 insertions(+), 155 deletions(-)



More information about the gnucash-changes mailing list