From 17ced7eb2867b3cace0d67c5f0c364fbd9b32fa0 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 6 Nov 2020 13:10:19 +0000 Subject: [PATCH] Fix some incorrect links to the help file --- gnucash/gnome-utils/gnc-ui.h | 11 +++++++---- gnucash/gnome/dialog-invoice.c | 16 +++++++++++++++- gnucash/gnome/dialog-job.c | 2 +- .../bi-import/dialog-bi-import-gui.c | 2 +- .../customer-import/dialog-customer-import-gui.c | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/gnucash/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h index a5049ddeaf..fb102c654b 100644 --- a/gnucash/gnome-utils/gnc-ui.h +++ b/gnucash/gnome-utils/gnc-ui.h @@ -51,13 +51,14 @@ #endif /** Links in the Help Files *****************************************/ -#define HL_USAGE "usage" -#define HL_USAGE_BSNSS "chapter_busnss" +#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" @@ -65,10 +66,12 @@ #define HL_GLOBPREFS "set-prefs" #define HL_PRINTCHECK "print-check" #define HL_RECNWIN "acct-reconcile" -#define HL_SXEDITOR "tool-sched" +#define HL_SXEDITOR "trans-sched" #define HL_BOOK_OPTIONS "book-options" #define HL_CLOSE_BOOK "tool-close-book" -#define HL_USAGE_CUSTOMREP "report-custom" +#define HL_USAGE_CUSTOMREP "report-saving" +#define HL_IMPORT_BC "busnss-imp-bills-invoices" +#define HL_IMPORT_CUST "busnss-imp-customer-vendor" /* GTK Windows - Common Response Codes */ diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c index ff309db53c..81a82e6aa8 100644 --- a/gnucash/gnome/dialog-invoice.c +++ b/gnucash/gnome/dialog-invoice.c @@ -538,7 +538,21 @@ gnc_invoice_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_invoice_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_HELP, HL_USAGE_INVOICE); + InvoiceWindow *iw = data; + GncOwnerType owner_type = gncOwnerGetType (&iw->owner); + + switch(owner_type) + { + case GNC_OWNER_CUSTOMER: + gnc_gnome_help (HF_HELP, HL_USAGE_INVOICE); + break; + case GNC_OWNER_VENDOR: + gnc_gnome_help (HF_HELP, HL_USAGE_BILL); + break; + default: + gnc_gnome_help (HF_HELP, HL_USAGE_VOUCHER); + break; + } } static const gchar * diff --git a/gnucash/gnome/dialog-job.c b/gnucash/gnome/dialog-job.c index d59a3beb41..e698261bb8 100644 --- a/gnucash/gnome/dialog-job.c +++ b/gnucash/gnome/dialog-job.c @@ -202,7 +202,7 @@ gnc_job_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_job_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_HELP, HL_USAGE_BSNSS); + gnc_gnome_help (HF_HELP, HL_USAGE_JOB); } 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 068fe9f8f5..c0cf435bc7 100644 --- a/gnucash/import-export/bi-import/dialog-bi-import-gui.c +++ b/gnucash/import-export/bi-import/dialog-bi-import-gui.c @@ -252,7 +252,7 @@ gnc_bi_import_gui_cancel_cb (GtkWidget *widget, gpointer data) void gnc_bi_import_gui_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_HELP, HL_USAGE_BSNSS); + gnc_gnome_help (HF_GUIDE, HL_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 92b343d71d..b34d9fac3f 100644 --- a/gnucash/import-export/customer-import/dialog-customer-import-gui.c +++ b/gnucash/import-export/customer-import/dialog-customer-import-gui.c @@ -228,7 +228,7 @@ gnc_customer_import_gui_cancel_cb (GtkWidget *widget, gpointer data) void gnc_customer_import_gui_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_HELP, HL_USAGE_BSNSS); + gnc_gnome_help (HF_GUIDE, HL_IMPORT_CUST); } static void