diff --git a/ChangeLog b/ChangeLog index 9198806eee..11ca66f8e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-30 David Hampton + + * various: Update the help file names now that the docs are xml + instead of html. Fixes #343255. + + * src/scm: Remove old help-topics-index files. + 2006-05-29 Joshua Sled * packaging/gnucash-1.9.x.ebuild: Remove support for being a diff --git a/src/business/business-gnome/dialog-customer.c b/src/business/business-gnome/dialog-customer.c index 6840c29022..1130e3fc91 100644 --- a/src/business/business-gnome/dialog-customer.c +++ b/src/business/business-gnome/dialog-customer.c @@ -327,7 +327,7 @@ gnc_customer_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_customer_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } void diff --git a/src/business/business-gnome/dialog-employee.c b/src/business/business-gnome/dialog-employee.c index 5e3da3c1de..af1466ccbf 100644 --- a/src/business/business-gnome/dialog-employee.c +++ b/src/business/business-gnome/dialog-employee.c @@ -263,7 +263,7 @@ gnc_employee_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_employee_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } void diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 12dd313407..e6ee4c2fa5 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -406,7 +406,7 @@ gnc_invoice_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_invoice_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } void diff --git a/src/business/business-gnome/dialog-job.c b/src/business/business-gnome/dialog-job.c index 761f1cec36..2adecf53e7 100644 --- a/src/business/business-gnome/dialog-job.c +++ b/src/business/business-gnome/dialog-job.c @@ -191,7 +191,7 @@ gnc_job_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_job_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } diff --git a/src/business/business-gnome/dialog-order.c b/src/business/business-gnome/dialog-order.c index c187de7548..aec423f8a0 100644 --- a/src/business/business-gnome/dialog-order.c +++ b/src/business/business-gnome/dialog-order.c @@ -224,7 +224,7 @@ gnc_order_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_order_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } void diff --git a/src/business/business-gnome/dialog-vendor.c b/src/business/business-gnome/dialog-vendor.c index 2e4f678ba9..d341b19dd3 100644 --- a/src/business/business-gnome/dialog-vendor.c +++ b/src/business/business-gnome/dialog-vendor.c @@ -250,7 +250,7 @@ gnc_vendor_window_cancel_cb (GtkWidget *widget, gpointer data) void gnc_vendor_window_help_cb (GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, NULL); + gnc_gnome_help(HF_HELP, HL_USAGE); } void diff --git a/src/gnc-ui.h b/src/gnc-ui.h index 67aedbd2c3..a3a4cd9f0b 100644 --- a/src/gnc-ui.h +++ b/src/gnc-ui.h @@ -39,12 +39,11 @@ /** Help Files ******************************************************/ -#define HF_USAGE "gnucash-help/usage.html" -#define HF_CUSTOM "gnucash-help/custom-gnucash.html" -#define HF_GUIDE "gnucash-guide/index.html" -#define HF_HELP "gnucash-help/help.html" +#define HF_GUIDE "gnucash-guide.xml" +#define HF_HELP "gnucash-help.xml" /** Links in the Help Files *****************************************/ +#define HL_USAGE "usage" #define HL_ACC "acct-create" #define HL_ACCEDIT "acct-edit" #define HL_COMMODITY "tool-commodity" diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index ad4d805c3e..90ae8c47b1 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -512,7 +512,7 @@ search_cancel_cb (GtkButton *button, GNCSearchWindow *sw) static void search_help_cb (GtkButton *button, GNCSearchWindow *sw) { - gnc_gnome_help (HF_USAGE, HL_FIND_TRANSACTIONS); + gnc_gnome_help (HF_HELP, HL_FIND_TRANSACTIONS); } static void diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index cd28ec03f5..fff37f75da 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -990,11 +990,11 @@ gnc_account_window_response_cb (GtkDialog *dialog, switch (aw->dialog_type) { case NEW_ACCOUNT: DEBUG("new acct dialog, HELP"); - gnc_gnome_help(HF_USAGE, HL_ACC); + gnc_gnome_help(HF_HELP, HL_ACC); break; case EDIT_ACCOUNT: DEBUG("edit acct dialog, HELP"); - gnc_gnome_help(HF_USAGE, HL_ACCEDIT); + gnc_gnome_help(HF_HELP, HL_ACCEDIT); break; default: g_assert_not_reached (); diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c index 29a28f9f70..9b58fe05c2 100644 --- a/src/gnome-utils/dialog-preferences.c +++ b/src/gnome-utils/dialog-preferences.c @@ -1282,7 +1282,7 @@ gnc_preferences_response_cb(GtkDialog *dialog, gint response, GtkDialog *unused) { switch (response) { case GTK_RESPONSE_HELP: - gnc_gnome_help(HF_CUSTOM, HL_GLOBPREFS); + gnc_gnome_help(HF_HELP, HL_GLOBPREFS); break; default: diff --git a/src/gnome-utils/gnc-gnome-utils.c b/src/gnome-utils/gnc-gnome-utils.c index 3f435621cf..bbaa6c069e 100644 --- a/src/gnome-utils/gnc-gnome-utils.c +++ b/src/gnome-utils/gnc-gnome-utils.c @@ -66,13 +66,13 @@ static int gnome_is_initialized = FALSE; static void gnc_global_options_help_cb (GNCOptionWin *win, gpointer dat) { - gnc_gnome_help (HF_CUSTOM, HL_GLOBPREFS); + gnc_gnome_help (HF_HELP, HL_GLOBPREFS); } static void gnc_commodity_help_cb (void) { - gnc_gnome_help (HF_USAGE, HL_COMMODITY); + gnc_gnome_help (HF_HELP, HL_COMMODITY); } /* gnc_configure_date_format diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 5c7d126ec1..adbe6e026f 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -409,7 +409,7 @@ gnc_ui_print_check_response_cb(GtkDialog * dialog, { switch (response) { case GTK_RESPONSE_HELP: - gnc_gnome_help(HF_USAGE, HL_PRINTCHECK); + gnc_gnome_help(HF_HELP, HL_PRINTCHECK); return; case GTK_RESPONSE_OK: diff --git a/src/gnome/dialog-scheduledxaction.c b/src/gnome/dialog-scheduledxaction.c index 038ef04344..ec1747cfb0 100644 --- a/src/gnome/dialog-scheduledxaction.c +++ b/src/gnome/dialog-scheduledxaction.c @@ -349,7 +349,7 @@ static void editor_help_button_clicked(GtkButton *b, SchedXactionEditorDialog *sxed) { - gnc_gnome_help(HF_USAGE, HL_SXEDITOR); + gnc_gnome_help(HF_HELP, HL_SXEDITOR); } static void diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index ba9704725a..2f855aff8d 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1080,7 +1080,7 @@ gnc_reconcile_window_get_current_split(RecnWindow *recnData) static void gnc_ui_reconcile_window_help_cb(GtkWidget *widget, gpointer data) { - gnc_gnome_help(HF_USAGE, HL_RECNWIN); + gnc_gnome_help(HF_HELP, HL_RECNWIN); } static void