From fc20b3ac55e1f3905879c5d11ab3d531d7c335d7 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 22 Aug 2003 01:42:57 +0000 Subject: [PATCH] app/display/gimpdisplayshell.c app/gui/brush-select.c 2003-08-22 Michael Natterer * app/display/gimpdisplayshell.c * app/gui/brush-select.c * app/gui/channels-menu.c * app/gui/convert-dialog.c * app/gui/file-open-menu.c * app/gui/file-save-menu.c * app/gui/font-select.c * app/gui/gradient-select.c * app/gui/gui.c * app/gui/image-commands.c * app/gui/image-menu.c * app/gui/layers-menu.c * app/gui/menus.c * app/gui/palette-import-dialog.c * app/gui/palette-select.c * app/gui/palettes-commands.c * app/gui/pattern-select.c * app/gui/preferences-dialog.c * app/gui/qmask-commands.c * app/gui/qmask-menu.c * app/gui/templates-commands.c * app/gui/toolbox-menu.c * app/gui/vectors-menu.c * app/tools/[all tools].c * app/widgets/gimperrorconsole.c * app/widgets/gimpitemfactory.c * app/widgets/gimptoolbox.c * app/widgets/gimphelp-ids.h: added, fixed and updated lots of help IDs. Still unfinished. --- ChangeLog | 32 ++ app/actions/image-commands.c | 11 +- app/actions/palettes-commands.c | 3 +- app/actions/qmask-commands.c | 21 +- app/actions/quick-mask-commands.c | 21 +- app/actions/templates-commands.c | 5 +- app/dialogs/convert-dialog.c | 3 +- app/dialogs/palette-import-dialog.c | 3 +- app/dialogs/preferences-dialog.c | 47 +-- app/display/gimpdisplayshell-draw.c | 7 +- app/display/gimpdisplayshell.c | 7 +- app/gui/brush-select.c | 13 +- app/gui/channels-menu.c | 8 +- app/gui/convert-dialog.c | 3 +- app/gui/file-open-menu.c | 5 +- app/gui/file-save-menu.c | 3 +- app/gui/font-select.c | 13 +- app/gui/gradient-select.c | 3 +- app/gui/gui.c | 3 +- app/gui/image-commands.c | 11 +- app/gui/image-menu.c | 18 +- app/gui/layers-menu.c | 4 +- app/gui/menus.c | 7 +- app/gui/palette-import-dialog.c | 3 +- app/gui/palette-select.c | 15 +- app/gui/palettes-commands.c | 3 +- app/gui/pattern-select.c | 13 +- app/gui/preferences-dialog.c | 47 +-- app/gui/qmask-commands.c | 21 +- app/gui/qmask-menu.c | 13 +- app/gui/templates-commands.c | 5 +- app/gui/toolbox-menu.c | 2 +- app/gui/vectors-menu.c | 8 +- app/menus/file-open-menu.c | 5 +- app/menus/file-save-menu.c | 3 +- app/menus/image-menu.c | 18 +- app/menus/menus.c | 7 +- app/menus/toolbox-menu.c | 2 +- app/paint/gimpink.c | 64 ++-- app/tools/gimpairbrushtool.c | 3 +- app/tools/gimpblendtool.c | 4 +- app/tools/gimpbrightnesscontrasttool.c | 6 +- app/tools/gimpbucketfilltool.c | 8 +- app/tools/gimpbycolorselecttool.c | 4 +- app/tools/gimpclonetool.c | 7 +- app/tools/gimpcolorbalancetool.c | 7 +- app/tools/gimpcolorizetool.c | 6 +- app/tools/gimpcolorpickertool.c | 3 +- app/tools/gimpconvolvetool.c | 3 +- app/tools/gimpcroptool.c | 13 +- app/tools/gimpcurvestool.c | 3 +- app/tools/gimpdodgeburntool.c | 3 +- app/tools/gimpellipseselecttool.c | 8 +- app/tools/gimperasertool.c | 3 +- app/tools/gimpfliptool.c | 7 +- app/tools/gimpfreeselecttool.c | 6 +- app/tools/gimpfuzzyselecttool.c | 4 +- app/tools/gimphistogramtool.c | 11 +- app/tools/gimphuesaturationtool.c | 6 +- app/tools/gimpinktool.c | 64 ++-- app/tools/gimpiscissorstool.c | 38 +- app/tools/gimplevelstool.c | 27 +- app/tools/gimpmagnifytool.c | 7 +- app/tools/gimpmeasuretool.c | 23 +- app/tools/gimpmovetool.c | 5 +- app/tools/gimppaintbrushtool.c | 4 +- app/tools/gimppenciltool.c | 4 +- app/tools/gimpperspectivetool.c | 19 +- app/tools/gimpposterizetool.c | 8 +- app/tools/gimprectselecttool.c | 12 +- app/tools/gimpregionselecttool.c | 4 +- app/tools/gimprotatetool.c | 21 +- app/tools/gimpscaletool.c | 27 +- app/tools/gimpsheartool.c | 17 +- app/tools/gimpsmudgetool.c | 3 +- app/tools/gimpsourcetool.c | 7 +- app/tools/gimptexttool.c | 3 +- app/tools/gimpthresholdtool.c | 5 +- app/tools/gimpvectortool.c | 32 +- app/widgets/gimperrorconsole.c | 7 +- app/widgets/gimphelp-ids.h | 477 ++++++++++++++----------- app/widgets/gimpitemfactory.c | 10 +- app/widgets/gimptoolbox.c | 7 +- 83 files changed, 801 insertions(+), 625 deletions(-) diff --git a/ChangeLog b/ChangeLog index 687a171d1e..a4d5da5a4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2003-08-22 Michael Natterer + + * app/display/gimpdisplayshell.c + * app/gui/brush-select.c + * app/gui/channels-menu.c + * app/gui/convert-dialog.c + * app/gui/file-open-menu.c + * app/gui/file-save-menu.c + * app/gui/font-select.c + * app/gui/gradient-select.c + * app/gui/gui.c + * app/gui/image-commands.c + * app/gui/image-menu.c + * app/gui/layers-menu.c + * app/gui/menus.c + * app/gui/palette-import-dialog.c + * app/gui/palette-select.c + * app/gui/palettes-commands.c + * app/gui/pattern-select.c + * app/gui/preferences-dialog.c + * app/gui/qmask-commands.c + * app/gui/qmask-menu.c + * app/gui/templates-commands.c + * app/gui/toolbox-menu.c + * app/gui/vectors-menu.c + * app/tools/[all tools].c + * app/widgets/gimperrorconsole.c + * app/widgets/gimpitemfactory.c + * app/widgets/gimptoolbox.c + * app/widgets/gimphelp-ids.h: added, fixed and updated lots of + help IDs. Still unfinished. + 2003-08-22 Sven Neumann * tools/gimpblendtool.c diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c index 5e0b868048..1f25e64d9f 100644 --- a/app/actions/image-commands.c +++ b/app/actions/image-commands.c @@ -37,6 +37,7 @@ #include "core/gimpimage-scale.h" #include "core/gimpimage-undo.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -378,7 +379,7 @@ image_layers_merge_query (GimpImage *gimage, GIMP_STOCK_MERGE_DOWN, _("Layers Merge Options"), gimp_standard_help_func, - "dialogs/layers/merge_visible_layers.html", + GIMP_HELP_IMAGE_MERGE_LAYERS, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, @@ -442,7 +443,7 @@ image_resize_callback (GtkWidget *widget, gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE); if (image_resize->resize->width > 0 && - image_resize->resize->height > 0) + image_resize->resize->height > 0) { GimpProgress *progress; @@ -461,7 +462,7 @@ image_resize_callback (GtkWidget *widget, gimp_image_flush (image_resize->gimage); } - else + else { g_message (_("Resize Error: Both width and height must be " "greater than zero.")); @@ -498,7 +499,7 @@ image_scale_callback (GtkWidget *widget, dialog = gimp_query_boolean_box (_("Layer Too Small"), gimp_standard_help_func, - "dialogs/scale_layer_warn.html", + GIMP_HELP_IMAGE_SCALE_WARNING, GTK_STOCK_DIALOG_QUESTION, _("The chosen image size will shrink\n" "some layers completely away.\n" @@ -562,7 +563,7 @@ image_scale_implement (ImageResize *image_scale) image_scale->resize->height != gimage->height) { if (image_scale->resize->width > 0 && - image_scale->resize->height > 0) + image_scale->resize->height > 0) { GimpProgress *progress; diff --git a/app/actions/palettes-commands.c b/app/actions/palettes-commands.c index e057326e65..55a346ffaf 100644 --- a/app/actions/palettes-commands.c +++ b/app/actions/palettes-commands.c @@ -30,6 +30,7 @@ #include "widgets/gimpcontainertreeview.h" #include "widgets/gimpdatafactoryview.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppreview.h" #include "palette-import-dialog.h" @@ -80,7 +81,7 @@ palettes_merge_palettes_query (GimpContainerEditor *editor) qbox = gimp_query_string_box (_("Merge Palette"), gimp_standard_help_func, - "dialogs/palette_editor/merge_palette.html", + GIMP_HELP_PALETTE_MERGE, _("Enter a name for merged palette"), NULL, G_OBJECT (editor), "destroy", diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index 987d434af8..d7a4932ed8 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -31,6 +31,7 @@ #include "core/gimpimage-qmask.h" #include "widgets/gimpcolorpanel.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -56,7 +57,7 @@ struct _EditQmaskOptions /* local function prototypes */ static void qmask_channel_query (GimpDisplayShell *shell); -static void qmask_query_ok_callback (GtkWidget *widget, +static void qmask_query_ok_callback (GtkWidget *widget, gpointer client_data); static void qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data); @@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell) options->gimage = shell->gdisp->gimage; options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), &options->gimage->qmask_color, - GIMP_COLOR_AREA_LARGE_CHECKS, + GIMP_COLOR_AREA_LARGE_CHECKS, 48, 64); gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_get_user_context (options->gimage->gimp)); @@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell) GIMP_STOCK_QMASK_ON, _("Edit QuickMask Attributes"), gimp_standard_help_func, - "dialogs/edit_qmask_attributes.html", + GIMP_HELP_QMASK_EDIT, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, @@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell) /* The opacity scale */ opacity_scale_data = - gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, + gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); gtk_widget_set_size_request (opacity_scale, 100, -1); @@ -202,14 +203,14 @@ qmask_channel_query (GimpDisplayShell *shell) g_signal_connect (options->color_panel, "color_changed", G_CALLBACK (qmask_query_color_changed), - opacity_scale_data); + opacity_scale_data); gtk_widget_show (options->query_box); } -static void -qmask_query_ok_callback (GtkWidget *widget, - gpointer data) +static void +qmask_query_ok_callback (GtkWidget *widget, + gpointer data) { EditQmaskOptions *options; GimpChannel *channel; @@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget, gtk_widget_destroy (options->query_box); } -static void -qmask_query_scale_update (GtkAdjustment *adjustment, +static void +qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data) { GimpRGB color; diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index 987d434af8..d7a4932ed8 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -31,6 +31,7 @@ #include "core/gimpimage-qmask.h" #include "widgets/gimpcolorpanel.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -56,7 +57,7 @@ struct _EditQmaskOptions /* local function prototypes */ static void qmask_channel_query (GimpDisplayShell *shell); -static void qmask_query_ok_callback (GtkWidget *widget, +static void qmask_query_ok_callback (GtkWidget *widget, gpointer client_data); static void qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data); @@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell) options->gimage = shell->gdisp->gimage; options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), &options->gimage->qmask_color, - GIMP_COLOR_AREA_LARGE_CHECKS, + GIMP_COLOR_AREA_LARGE_CHECKS, 48, 64); gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_get_user_context (options->gimage->gimp)); @@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell) GIMP_STOCK_QMASK_ON, _("Edit QuickMask Attributes"), gimp_standard_help_func, - "dialogs/edit_qmask_attributes.html", + GIMP_HELP_QMASK_EDIT, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, @@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell) /* The opacity scale */ opacity_scale_data = - gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, + gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); gtk_widget_set_size_request (opacity_scale, 100, -1); @@ -202,14 +203,14 @@ qmask_channel_query (GimpDisplayShell *shell) g_signal_connect (options->color_panel, "color_changed", G_CALLBACK (qmask_query_color_changed), - opacity_scale_data); + opacity_scale_data); gtk_widget_show (options->query_box); } -static void -qmask_query_ok_callback (GtkWidget *widget, - gpointer data) +static void +qmask_query_ok_callback (GtkWidget *widget, + gpointer data) { EditQmaskOptions *options; GimpChannel *channel; @@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget, gtk_widget_destroy (options->query_box); } -static void -qmask_query_scale_update (GtkAdjustment *adjustment, +static void +qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data) { GimpRGB color; diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c index cc3b2acdcc..e2df5e1afe 100644 --- a/app/actions/templates-commands.c +++ b/app/actions/templates-commands.c @@ -32,6 +32,7 @@ #include "core/gimptemplate.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimptemplateeditor.h" #include "widgets/gimptemplateview.h" #include "widgets/gimpviewabledialog.h" @@ -133,7 +134,7 @@ templates_new_template_dialog (Gimp *gimp, GIMP_STOCK_TEMPLATE, _("Create a New Template"), gimp_standard_help_func, - "dialogs/new_template.html", + GIMP_HELP_TEMPLATE_NEW, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, (gpointer) 1, NULL, FALSE, TRUE, @@ -202,7 +203,7 @@ templates_edit_template_dialog (Gimp *gimp, GIMP_STOCK_EDIT, _("Edit Template"), gimp_standard_help_func, - "dialogs/edit_template.html", + GIMP_HELP_TEMPLATE_EDIT, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, (gpointer) 1, NULL, FALSE, TRUE, diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index 8e70c2d110..8254cb8d31 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -32,6 +32,7 @@ #include "core/gimppalette.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "palette-select.h" @@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage) GIMP_STOCK_CONVERT_INDEXED, _("Convert Image to Indexed Colors"), gimp_standard_help_func, - "dialogs/convert_to_indexed.html", + GIMP_HELP_IMAGE_CONVERT_INDEXED, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 6ed7eedac6..c90ba199c3 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -39,6 +39,7 @@ #include "widgets/gimpcontainermenuimpl.h" #include "widgets/gimpdnd.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppreview.h" #include "widgets/gimpviewabledialog.h" @@ -167,7 +168,7 @@ palette_import_dialog_new (Gimp *gimp) GTK_STOCK_CONVERT, _("Import a New Palette"), gimp_standard_help_func, - "dialogs/palette_editor/import_palette.html", + GIMP_HELP_PALETTE_IMPORT, GTK_STOCK_CANCEL, palette_import_close_callback, import_dialog, NULL, NULL, FALSE, TRUE, diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 75cf160ba2..c7f00b2476 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -39,6 +39,7 @@ #include "widgets/gimpdeviceinfo.h" #include "widgets/gimpdevices.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -893,7 +894,7 @@ prefs_dialog_new (Gimp *gimp, dialog = gimp_dialog_new (_("Preferences"), "preferences", prefs_help_func, - "dialogs/preferences/preferences.html", + GIMP_HELP_PREFS_DIALOG, GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, @@ -1015,7 +1016,7 @@ prefs_dialog_new (Gimp *gimp, "new-image.png", GTK_TREE_STORE (tree), _("New Image"), - "dialogs/preferences/new_file.html", + GIMP_HELP_PREFS_NEW_IMAGE, NULL, &top_iter, page_index++); @@ -1112,7 +1113,7 @@ prefs_dialog_new (Gimp *gimp, "default-comment.png", GTK_TREE_STORE (tree), _("Default Comment"), - "dialogs/preferences/new_file.html#default_comment", + GIMP_HELP_PREFS_NEW_IMAGE_COMMENT, &top_iter, &child_iter, page_index++); @@ -1149,7 +1150,7 @@ prefs_dialog_new (Gimp *gimp, "interface.png", GTK_TREE_STORE (tree), _("Interface"), - "dialogs/preferences/interface.html", + GIMP_HELP_PREFS_INTERFACE, NULL, &top_iter, page_index++); @@ -1269,7 +1270,7 @@ prefs_dialog_new (Gimp *gimp, "help-system.png", GTK_TREE_STORE (tree), _("Help System"), - "dialogs/preferences/interface.html#help_system", + GIMP_HELP_PREFS_HELP, &top_iter, &child_iter, page_index++); @@ -1305,7 +1306,7 @@ prefs_dialog_new (Gimp *gimp, "tool-options.png", GTK_TREE_STORE (tree), _("Tool Options"), - "dialogs/preferences/interface.html#tool_options", + GIMP_HELP_PREFS_TOOL_OPTIONS, &top_iter, &child_iter, page_index++); @@ -1337,7 +1338,7 @@ prefs_dialog_new (Gimp *gimp, "input-devices.png", GTK_TREE_STORE (tree), _("Input Devices"), - "dialogs/preferences/input-devices.html", + GIMP_HELP_PREFS_INPUT_DEVICES, &top_iter, &child_iter, page_index++); @@ -1385,7 +1386,7 @@ prefs_dialog_new (Gimp *gimp, "image-windows.png", GTK_TREE_STORE (tree), _("Image Windows"), - "dialogs/preferences/interface.html#image_windows", + GIMP_HELP_PREFS_IMAGE_WINDOW, &top_iter, &child_iter, page_index++); @@ -1452,7 +1453,7 @@ prefs_dialog_new (Gimp *gimp, "image-windows.png", GTK_TREE_STORE (tree), _("Appearance"), - "dialogs/preferences/image_windows.html", + GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE, &child_iter, &grandchild_iter, page_index++); @@ -1525,7 +1526,7 @@ prefs_dialog_new (Gimp *gimp, "image-title.png", GTK_TREE_STORE (tree), _("Title & Status"), - "dialogs/preferences/image_windows.html", + GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE, &child_iter, &grandchild_iter, page_index++); @@ -1650,7 +1651,7 @@ prefs_dialog_new (Gimp *gimp, "display.png", GTK_TREE_STORE (tree), _("Display"), - "dialogs/preferences/display.html", + GIMP_HELP_PREFS_DISPLAY, &top_iter, &child_iter, page_index++); @@ -1694,7 +1695,7 @@ prefs_dialog_new (Gimp *gimp, "monitor.png", GTK_TREE_STORE (tree), _("Monitor"), - "dialogs/preferences/monitor.html", + GIMP_HELP_PREFS_MONITOR, &top_iter, &child_iter, page_index++); @@ -1808,7 +1809,7 @@ prefs_dialog_new (Gimp *gimp, "environment.png", GTK_TREE_STORE (tree), _("Environment"), - "dialogs/preferences/environment.html", + GIMP_HELP_PREFS_ENVIRONMENT, NULL, &top_iter, page_index++); @@ -1866,7 +1867,7 @@ prefs_dialog_new (Gimp *gimp, "folders.png", GTK_TREE_STORE (tree), _("Folders"), - "dialogs/preferences/folders.html", + GIMP_HELP_PREFS_FOLDERS, NULL, &top_iter, page_index++); @@ -1915,39 +1916,39 @@ prefs_dialog_new (Gimp *gimp, paths[] = { { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", - "dialogs/preferences/folders.html#brushes", + GIMP_HELP_PREFS_FOLDERS_BRUSHES, N_("Select Brush Folders"), "brush-path" }, { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", - "dialogs/preferences/folders.html#patterns", + GIMP_HELP_PREFS_FOLDERS_PATTERNS, N_("Select Pattern Folders"), "pattern-path" }, { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", - "dialogs/preferences/folders.html#palettes", + GIMP_HELP_PREFS_FOLDERS_PALETTES, N_("Select Palette Folders"), "palette-path" }, { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", - "dialogs/preferences/folders.html#gradients", + GIMP_HELP_PREFS_FOLDERS_GRADIENTS, N_("Select Gradient Folders"), "gradient-path" }, { N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", - "dialogs/preferences/folders.html#plug_ins", + GIMP_HELP_PREFS_FOLDERS_PLUG_INS, N_("Select Plug-In Folders"), "plug-in-path" }, { N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png", - "dialogs/preferences/folders.html#scripts", + GIMP_HELP_PREFS_FOLDERS_SCRIPTS, N_("Select Script-Fu Folders"), "script-fu-path" }, { N_("Modules"), N_("Module Folders"), "folders-modules.png", - "dialogs/preferences/folders.html#modules", + GIMP_HELP_PREFS_FOLDERS_MODULES, N_("Select Module Folders"), "module-path" }, { N_("Environment"), N_("Environment Folders"), "folders-environ.png", - "dialogs/preferences/folders.html#environ", + GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT, N_("Select Environment Folders"), "environ-path" }, { N_("Themes"), N_("Theme Folders"), "folders-themes.png", - "dialogs/preferences/folders.html#themes", + GIMP_HELP_PREFS_FOLDERS_THEMES, N_("Select Theme Folders"), "theme-path" } }; diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 7ad57efe4f..150d1b71dd 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -51,6 +51,7 @@ #include "widgets/gimpcolorpanel.h" #include "widgets/gimpdnd.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "widgets/gimpmenufactory.h" #include "widgets/gimpwidgets-utils.h" @@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell) gimp_display_shell_drop_color, shell); - /* connect the "F1" help key */ - gimp_help_connect (GTK_WIDGET (shell), - gimp_standard_help_func, + gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func, "image/image_window.html"); } @@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell, shell->warning_dialog = gimp_query_boolean_box (title, gimp_standard_help_func, - "dialogs/really_close.html", + GIMP_HELP_FILE_CLOSE_CONFIRM, GIMP_STOCK_QUESTION, warning, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 7ad57efe4f..150d1b71dd 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -51,6 +51,7 @@ #include "widgets/gimpcolorpanel.h" #include "widgets/gimpdnd.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "widgets/gimpmenufactory.h" #include "widgets/gimpwidgets-utils.h" @@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell) gimp_display_shell_drop_color, shell); - /* connect the "F1" help key */ - gimp_help_connect (GTK_WIDGET (shell), - gimp_standard_help_func, + gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func, "image/image_window.html"); } @@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell, shell->warning_dialog = gimp_query_boolean_box (title, gimp_standard_help_func, - "dialogs/really_close.html", + GIMP_HELP_FILE_CLOSE_CONFIRM, GIMP_STOCK_QUESTION, warning, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, diff --git a/app/gui/brush-select.c b/app/gui/brush-select.c index 880bf6f2db..f351263a8a 100644 --- a/app/gui/brush-select.c +++ b/app/gui/brush-select.c @@ -36,8 +36,9 @@ #include "pdb/procedural_db.h" -#include "widgets/gimpcontainerview.h" #include "widgets/gimpbrushfactoryview.h" +#include "widgets/gimpcontainerview.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpwidgets-constructors.h" #include "brush-select.h" @@ -145,7 +146,7 @@ brush_select_new (Gimp *gimp, /* The shell */ bsp->shell = gimp_dialog_new (title, "brush_selection", gimp_standard_help_func, - "dialogs/brush_selection.html", + GIMP_HELP_BRUSH_DIALOG, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, @@ -177,7 +178,7 @@ brush_select_new (Gimp *gimp, gtk_table_set_row_spacings (GTK_TABLE (table), 2); /* Create the opacity scale widget */ - bsp->opacity_data = + bsp->opacity_data = GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Opacity:"), -1, 5, gimp_context_get_opacity (bsp->context) * 100.0, @@ -221,7 +222,7 @@ brush_select_free (BrushSelect *bsp) { g_return_if_fail (bsp != NULL); - gtk_widget_destroy (bsp->shell); + gtk_widget_destroy (bsp->shell); /* remove from active list */ brush_active_dialogs = g_slist_remove (brush_active_dialogs, bsp); @@ -298,7 +299,7 @@ brush_select_change_callbacks (BrushSelect *bsp, if (proc && brush) { - Argument *return_vals; + Argument *return_vals; gint nreturn_vals; return_vals = @@ -412,5 +413,5 @@ brush_select_close_callback (GtkWidget *widget, BrushSelect *bsp) { brush_select_change_callbacks (bsp, TRUE); - brush_select_free (bsp); + brush_select_free (bsp); } diff --git a/app/gui/channels-menu.c b/app/gui/channels-menu.c index f16cb9f3f7..181937a0d9 100644 --- a/app/gui/channels-menu.c +++ b/app/gui/channels-menu.c @@ -73,22 +73,22 @@ GimpItemFactoryEntry channels_menu_entries[] = channels_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_CHANNEL_SEL_REPLACE, NULL }, + GIMP_HELP_CHANNEL_SELECTION_REPLACE, NULL }, { { N_("/_Add to Selection"), NULL, channels_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_CHANNEL_SEL_ADD, NULL }, + GIMP_HELP_CHANNEL_SELECTION_ADD, NULL }, { { N_("/_Subtract from Selection"), NULL, channels_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_CHANNEL_SEL_SUB, NULL }, + GIMP_HELP_CHANNEL_SELECTION_SUBTRACT, NULL }, { { N_("/_Intersect with Selection"), NULL, channels_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_CHANNEL_SEL_INTERSECT, NULL }, + GIMP_HELP_CHANNEL_SELECTION_INTERSECT, NULL }, MENU_SEPARATOR ("/---"), diff --git a/app/gui/convert-dialog.c b/app/gui/convert-dialog.c index 8e70c2d110..8254cb8d31 100644 --- a/app/gui/convert-dialog.c +++ b/app/gui/convert-dialog.c @@ -32,6 +32,7 @@ #include "core/gimppalette.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "palette-select.h" @@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage) GIMP_STOCK_CONVERT_INDEXED, _("Convert Image to Indexed Colors"), gimp_standard_help_func, - "dialogs/convert_to_indexed.html", + GIMP_HELP_IMAGE_CONVERT_INDEXED, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, diff --git a/app/gui/file-open-menu.c b/app/gui/file-open-menu.c index aed1a74669..7701fd947e 100644 --- a/app/gui/file-open-menu.c +++ b/app/gui/file-open-menu.c @@ -30,6 +30,7 @@ #include "plug-in/plug-in-proc.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "file-commands.h" @@ -44,14 +45,14 @@ GimpItemFactoryEntry file_open_menu_entries[] = { { N_("/Automatic"), NULL, file_open_by_extension_cmd_callback, 0 }, NULL, - "open_by_extension.html", NULL }, + GIMP_HELP_FILE_OPEN_BY_EXTENSION, NULL }, MENU_SEPARATOR ("/---") }; gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries); - + void file_open_menu_setup (GimpItemFactory *factory) { diff --git a/app/gui/file-save-menu.c b/app/gui/file-save-menu.c index 2aaf262c96..43ecfe713b 100644 --- a/app/gui/file-save-menu.c +++ b/app/gui/file-save-menu.c @@ -31,6 +31,7 @@ #include "plug-in/plug-in-proc.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "file-commands.h" @@ -45,7 +46,7 @@ GimpItemFactoryEntry file_save_menu_entries[] = { { N_("/By Extension"), NULL, file_save_by_extension_cmd_callback, 0 }, NULL, - "save_by_extension.html", NULL }, + GIMP_HELP_FILE_SAVE_BY_EXTENSION, NULL }, MENU_SEPARATOR ("/---") }; diff --git a/app/gui/font-select.c b/app/gui/font-select.c index 915f20a0a4..7424f92162 100644 --- a/app/gui/font-select.c +++ b/app/gui/font-select.c @@ -35,6 +35,7 @@ #include "pdb/procedural_db.h" #include "widgets/gimpcontainertreeview.h" +#include "widgets/gimphelp-ids.h" #include "dialogs-constructors.h" #include "menus.h" @@ -101,7 +102,7 @@ font_select_new (Gimp *gimp, /* the shell */ font_select->shell = gimp_dialog_new (title, "font_selection", gimp_standard_help_func, - "dialogs/font_selection.html", + GIMP_HELP_FONT_DIALOG, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, @@ -135,7 +136,7 @@ font_select_free (FontSelect *font_select) { g_return_if_fail (font_select != NULL); - gtk_widget_destroy (font_select->shell); + gtk_widget_destroy (font_select->shell); /* remove from active list */ font_active_dialogs = g_slist_remove (font_active_dialogs, font_select); @@ -185,7 +186,7 @@ font_select_dialogs_check (void) { if (! procedural_db_lookup (font_select->context->gimp, font_select->callback_name)) - font_select_close_callback (NULL, font_select); + font_select_close_callback (NULL, font_select); } } } @@ -215,7 +216,7 @@ font_select_change_callbacks (FontSelect *font_select, if (proc && font) { - Argument *return_vals; + Argument *return_vals; gint nreturn_vals; return_vals = @@ -225,7 +226,7 @@ font_select_change_callbacks (FontSelect *font_select, GIMP_PDB_STRING, GIMP_OBJECT (font)->name, GIMP_PDB_INT32, closing, GIMP_PDB_END); - + if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) g_message (_("Unable to run font callback.\n" "The corresponding plug-in may have crashed.")); @@ -251,5 +252,5 @@ font_select_close_callback (GtkWidget *widget, FontSelect *font_select) { font_select_change_callbacks (font_select, TRUE); - font_select_free (font_select); + font_select_free (font_select); } diff --git a/app/gui/gradient-select.c b/app/gui/gradient-select.c index a70a3bdadd..e725e94478 100644 --- a/app/gui/gradient-select.c +++ b/app/gui/gradient-select.c @@ -37,6 +37,7 @@ #include "widgets/gimpcontainerview.h" #include "widgets/gimpdatafactoryview.h" +#include "widgets/gimphelp-ids.h" #include "dialogs-constructors.h" #include "gradient-select.h" @@ -116,7 +117,7 @@ gradient_select_new (Gimp *gimp, /* the shell */ gsp->shell = gimp_dialog_new (title, "gradient_selection", gimp_standard_help_func, - "dialogs/gradient_selection.html", + GIMP_HELP_GRADIENT_DIALOG, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, diff --git a/app/gui/gui.c b/app/gui/gui.c index a585d6257c..e0b82a2fff 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -48,6 +48,7 @@ #include "widgets/gimpdialogfactory.h" #include "widgets/gimperrorconsole.h" #include "widgets/gimphelp.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "widgets/gimpmenufactory.h" #include "widgets/gimpwidgets-utils.h" @@ -500,7 +501,7 @@ gui_exit_callback (Gimp *gimp, dialog = gimp_query_boolean_box (_("Quit The GIMP?"), gimp_standard_help_func, - "dialogs/really_quit.html", + GIMP_HELP_FILE_QUIT_CONFIRM, GIMP_STOCK_WILBER_EEK, _("Some files are unsaved.\n" "\nReally quit The GIMP?"), diff --git a/app/gui/image-commands.c b/app/gui/image-commands.c index 5e0b868048..1f25e64d9f 100644 --- a/app/gui/image-commands.c +++ b/app/gui/image-commands.c @@ -37,6 +37,7 @@ #include "core/gimpimage-scale.h" #include "core/gimpimage-undo.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -378,7 +379,7 @@ image_layers_merge_query (GimpImage *gimage, GIMP_STOCK_MERGE_DOWN, _("Layers Merge Options"), gimp_standard_help_func, - "dialogs/layers/merge_visible_layers.html", + GIMP_HELP_IMAGE_MERGE_LAYERS, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, @@ -442,7 +443,7 @@ image_resize_callback (GtkWidget *widget, gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE); if (image_resize->resize->width > 0 && - image_resize->resize->height > 0) + image_resize->resize->height > 0) { GimpProgress *progress; @@ -461,7 +462,7 @@ image_resize_callback (GtkWidget *widget, gimp_image_flush (image_resize->gimage); } - else + else { g_message (_("Resize Error: Both width and height must be " "greater than zero.")); @@ -498,7 +499,7 @@ image_scale_callback (GtkWidget *widget, dialog = gimp_query_boolean_box (_("Layer Too Small"), gimp_standard_help_func, - "dialogs/scale_layer_warn.html", + GIMP_HELP_IMAGE_SCALE_WARNING, GTK_STOCK_DIALOG_QUESTION, _("The chosen image size will shrink\n" "some layers completely away.\n" @@ -562,7 +563,7 @@ image_scale_implement (ImageResize *image_scale) image_scale->resize->height != gimage->height) { if (image_scale->resize->width > 0 && - image_scale->resize->height > 0) + image_scale->resize->height > 0) { GimpProgress *progress; diff --git a/app/gui/image-menu.c b/app/gui/image-menu.c index 74aa0f10a8..e954082be5 100644 --- a/app/gui/image-menu.c +++ b/app/gui/image-menu.c @@ -314,7 +314,7 @@ GimpItemFactoryEntry image_menu_entries[] = select_toggle_quickmask_cmd_callback, 0, "", GIMP_STOCK_QMASK_ON }, NULL, - GIMP_HELP_SELECT_QUICKMASK, NULL }, + GIMP_HELP_QMASK_TOGGLE, NULL }, { { N_("/Select/Save to _Channel"), NULL, select_save_cmd_callback, 0, "", GIMP_STOCK_SELECTION_TO_CHANNEL }, @@ -753,22 +753,22 @@ GimpItemFactoryEntry image_menu_entries[] = layers_mask_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL }, { { N_("/Layer/Mask/_Add to Selection"), NULL, layers_mask_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_LAYER_MASK_SEL_ADD, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_ADD, NULL }, { { N_("/Layer/Mask/_Subtract from Selection"), NULL, layers_mask_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_LAYER_MASK_SEL_SUB, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT, NULL }, { { N_("/Layer/Mask/_Intersect with Selection"), NULL, layers_mask_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_LAYER_MASK_SEL_INTERSECT, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT, NULL }, /* /Layer/Transparency */ @@ -785,22 +785,22 @@ GimpItemFactoryEntry image_menu_entries[] = layers_alpha_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL }, { { N_("/Layer/Transparency/A_dd to Selection"), NULL, layers_alpha_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_ADD, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_ADD, NULL }, { { N_("/Layer/Transparency/_Subtract from Selection"), NULL, layers_alpha_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_SUB, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT, NULL }, { { N_("/Layer/Transparency/_Intersect with Selection"), NULL, layers_alpha_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT, NULL }, MENU_SEPARATOR ("/Layer/Transparency/---"), diff --git a/app/gui/layers-menu.c b/app/gui/layers-menu.c index e6648b6cce..2a412ee262 100644 --- a/app/gui/layers-menu.c +++ b/app/gui/layers-menu.c @@ -126,7 +126,7 @@ GimpItemFactoryEntry layers_menu_entries[] = layers_mask_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL }, MENU_SEPARATOR ("/---"), @@ -138,7 +138,7 @@ GimpItemFactoryEntry layers_menu_entries[] = layers_alpha_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL }, MENU_SEPARATOR ("/---"), diff --git a/app/gui/menus.c b/app/gui/menus.c index 638a0a23f7..f40071c14f 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -33,6 +33,7 @@ #include "file/file-utils.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "widgets/gimpmenufactory.h" @@ -297,7 +298,7 @@ menus_last_opened_add (GimpItemFactory *item_factory, for (i = 0; i < n; i++) { - last_opened_entries[i].entry.path = + last_opened_entries[i].entry.path = g_strdup_printf ("/File/Open Recent/%02d", i + 1); if (i < 9) @@ -311,7 +312,7 @@ menus_last_opened_add (GimpItemFactory *item_factory, last_opened_entries[i].entry.item_type = ""; last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN; last_opened_entries[i].quark_string = NULL; - last_opened_entries[i].help_page = "file/last_opened.html"; + last_opened_entries[i].help_page = GIMP_HELP_FILE_OPEN_RECENT; last_opened_entries[i].description = NULL; } @@ -371,7 +372,7 @@ menus_filters_subdirs_to_top (GtkMenu *menu) { menu_item = GTK_MENU_ITEM (list->data); items++; - + if (menu_item->submenu) { if (submenus_passed) diff --git a/app/gui/palette-import-dialog.c b/app/gui/palette-import-dialog.c index 6ed7eedac6..c90ba199c3 100644 --- a/app/gui/palette-import-dialog.c +++ b/app/gui/palette-import-dialog.c @@ -39,6 +39,7 @@ #include "widgets/gimpcontainermenuimpl.h" #include "widgets/gimpdnd.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppreview.h" #include "widgets/gimpviewabledialog.h" @@ -167,7 +168,7 @@ palette_import_dialog_new (Gimp *gimp) GTK_STOCK_CONVERT, _("Import a New Palette"), gimp_standard_help_func, - "dialogs/palette_editor/import_palette.html", + GIMP_HELP_PALETTE_IMPORT, GTK_STOCK_CANCEL, palette_import_close_callback, import_dialog, NULL, NULL, FALSE, TRUE, diff --git a/app/gui/palette-select.c b/app/gui/palette-select.c index e98ad8cf97..81cc2f06a8 100644 --- a/app/gui/palette-select.c +++ b/app/gui/palette-select.c @@ -37,6 +37,7 @@ #include "widgets/gimpcontainerview.h" #include "widgets/gimpdatafactoryview.h" +#include "widgets/gimphelp-ids.h" #include "dialogs-constructors.h" #include "menus.h" @@ -46,7 +47,7 @@ #define STD_PALETTE_COLUMNS 6 -#define STD_PALETTE_ROWS 5 +#define STD_PALETTE_ROWS 5 /* local function prototypes */ @@ -118,7 +119,7 @@ palette_select_new (Gimp *gimp, /* the shell */ psp->shell = gimp_dialog_new (title, "palette_selection", gimp_standard_help_func, - "dialogs/palette_selection.html", + GIMP_HELP_PALETTE_DIALOG, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, @@ -153,7 +154,7 @@ palette_select_free (PaletteSelect *psp) { g_return_if_fail (psp != NULL); - gtk_widget_destroy (psp->shell); + gtk_widget_destroy (psp->shell); /* remove from active list */ palette_active_dialogs = g_slist_remove (palette_active_dialogs, psp); @@ -201,7 +202,7 @@ palette_select_dialogs_check (void) if (psp->callback_name) { if (! procedural_db_lookup (psp->context->gimp, psp->callback_name)) - palette_select_close_callback (NULL, psp); + palette_select_close_callback (NULL, psp); } } } @@ -230,7 +231,7 @@ palette_select_change_callbacks (PaletteSelect *psp, if (proc && palette) { - Argument *return_vals; + Argument *return_vals; gint nreturn_vals; return_vals = @@ -241,7 +242,7 @@ palette_select_change_callbacks (PaletteSelect *psp, GIMP_PDB_INT32, palette->n_colors, GIMP_PDB_INT32, closing, GIMP_PDB_END); - + if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) g_message (_("Unable to run palette callback.\n" "The corresponding plug-in may have crashed.")); @@ -267,5 +268,5 @@ palette_select_close_callback (GtkWidget *widget, PaletteSelect *psp) { palette_select_change_callbacks (psp, TRUE); - palette_select_free (psp); + palette_select_free (psp); } diff --git a/app/gui/palettes-commands.c b/app/gui/palettes-commands.c index e057326e65..55a346ffaf 100644 --- a/app/gui/palettes-commands.c +++ b/app/gui/palettes-commands.c @@ -30,6 +30,7 @@ #include "widgets/gimpcontainertreeview.h" #include "widgets/gimpdatafactoryview.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppreview.h" #include "palette-import-dialog.h" @@ -80,7 +81,7 @@ palettes_merge_palettes_query (GimpContainerEditor *editor) qbox = gimp_query_string_box (_("Merge Palette"), gimp_standard_help_func, - "dialogs/palette_editor/merge_palette.html", + GIMP_HELP_PALETTE_MERGE, _("Enter a name for merged palette"), NULL, G_OBJECT (editor), "destroy", diff --git a/app/gui/pattern-select.c b/app/gui/pattern-select.c index 73741f049e..3d004aef65 100644 --- a/app/gui/pattern-select.c +++ b/app/gui/pattern-select.c @@ -38,6 +38,7 @@ #include "widgets/gimpcontainerview.h" #include "widgets/gimpdatafactoryview.h" +#include "widgets/gimphelp-ids.h" #include "menus.h" #include "pattern-select.h" @@ -114,7 +115,7 @@ pattern_select_new (Gimp *gimp, /* the shell */ psp->shell = gimp_dialog_new (title, "pattern_selection", gimp_standard_help_func, - "dialogs/pattern_selection.html", + GIMP_HELP_PATTERN_DIALOG, GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, @@ -149,7 +150,7 @@ pattern_select_free (PatternSelect *psp) { g_return_if_fail (psp != NULL); - gtk_widget_destroy (psp->shell); + gtk_widget_destroy (psp->shell); /* remove from active list */ pattern_active_dialogs = g_slist_remove (pattern_active_dialogs, psp); @@ -197,7 +198,7 @@ pattern_select_dialogs_check (void) if (psp->callback_name) { if (! procedural_db_lookup (psp->context->gimp, psp->callback_name)) - pattern_select_close_callback (NULL, psp); + pattern_select_close_callback (NULL, psp); } } } @@ -226,7 +227,7 @@ pattern_select_change_callbacks (PatternSelect *psp, if (proc && pattern) { - Argument *return_vals; + Argument *return_vals; gint nreturn_vals; return_vals = @@ -243,7 +244,7 @@ pattern_select_change_callbacks (PatternSelect *psp, GIMP_PDB_INT8ARRAY, temp_buf_data (pattern->mask), GIMP_PDB_INT32, closing, GIMP_PDB_END); - + if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) g_message (_("Unable to run pattern callback.\n" "The corresponding plug-in may have crashed.")); @@ -269,5 +270,5 @@ pattern_select_close_callback (GtkWidget *widget, PatternSelect *psp) { pattern_select_change_callbacks (psp, TRUE); - pattern_select_free (psp); + pattern_select_free (psp); } diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 75cf160ba2..c7f00b2476 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -39,6 +39,7 @@ #include "widgets/gimpdeviceinfo.h" #include "widgets/gimpdevices.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -893,7 +894,7 @@ prefs_dialog_new (Gimp *gimp, dialog = gimp_dialog_new (_("Preferences"), "preferences", prefs_help_func, - "dialogs/preferences/preferences.html", + GIMP_HELP_PREFS_DIALOG, GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, @@ -1015,7 +1016,7 @@ prefs_dialog_new (Gimp *gimp, "new-image.png", GTK_TREE_STORE (tree), _("New Image"), - "dialogs/preferences/new_file.html", + GIMP_HELP_PREFS_NEW_IMAGE, NULL, &top_iter, page_index++); @@ -1112,7 +1113,7 @@ prefs_dialog_new (Gimp *gimp, "default-comment.png", GTK_TREE_STORE (tree), _("Default Comment"), - "dialogs/preferences/new_file.html#default_comment", + GIMP_HELP_PREFS_NEW_IMAGE_COMMENT, &top_iter, &child_iter, page_index++); @@ -1149,7 +1150,7 @@ prefs_dialog_new (Gimp *gimp, "interface.png", GTK_TREE_STORE (tree), _("Interface"), - "dialogs/preferences/interface.html", + GIMP_HELP_PREFS_INTERFACE, NULL, &top_iter, page_index++); @@ -1269,7 +1270,7 @@ prefs_dialog_new (Gimp *gimp, "help-system.png", GTK_TREE_STORE (tree), _("Help System"), - "dialogs/preferences/interface.html#help_system", + GIMP_HELP_PREFS_HELP, &top_iter, &child_iter, page_index++); @@ -1305,7 +1306,7 @@ prefs_dialog_new (Gimp *gimp, "tool-options.png", GTK_TREE_STORE (tree), _("Tool Options"), - "dialogs/preferences/interface.html#tool_options", + GIMP_HELP_PREFS_TOOL_OPTIONS, &top_iter, &child_iter, page_index++); @@ -1337,7 +1338,7 @@ prefs_dialog_new (Gimp *gimp, "input-devices.png", GTK_TREE_STORE (tree), _("Input Devices"), - "dialogs/preferences/input-devices.html", + GIMP_HELP_PREFS_INPUT_DEVICES, &top_iter, &child_iter, page_index++); @@ -1385,7 +1386,7 @@ prefs_dialog_new (Gimp *gimp, "image-windows.png", GTK_TREE_STORE (tree), _("Image Windows"), - "dialogs/preferences/interface.html#image_windows", + GIMP_HELP_PREFS_IMAGE_WINDOW, &top_iter, &child_iter, page_index++); @@ -1452,7 +1453,7 @@ prefs_dialog_new (Gimp *gimp, "image-windows.png", GTK_TREE_STORE (tree), _("Appearance"), - "dialogs/preferences/image_windows.html", + GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE, &child_iter, &grandchild_iter, page_index++); @@ -1525,7 +1526,7 @@ prefs_dialog_new (Gimp *gimp, "image-title.png", GTK_TREE_STORE (tree), _("Title & Status"), - "dialogs/preferences/image_windows.html", + GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE, &child_iter, &grandchild_iter, page_index++); @@ -1650,7 +1651,7 @@ prefs_dialog_new (Gimp *gimp, "display.png", GTK_TREE_STORE (tree), _("Display"), - "dialogs/preferences/display.html", + GIMP_HELP_PREFS_DISPLAY, &top_iter, &child_iter, page_index++); @@ -1694,7 +1695,7 @@ prefs_dialog_new (Gimp *gimp, "monitor.png", GTK_TREE_STORE (tree), _("Monitor"), - "dialogs/preferences/monitor.html", + GIMP_HELP_PREFS_MONITOR, &top_iter, &child_iter, page_index++); @@ -1808,7 +1809,7 @@ prefs_dialog_new (Gimp *gimp, "environment.png", GTK_TREE_STORE (tree), _("Environment"), - "dialogs/preferences/environment.html", + GIMP_HELP_PREFS_ENVIRONMENT, NULL, &top_iter, page_index++); @@ -1866,7 +1867,7 @@ prefs_dialog_new (Gimp *gimp, "folders.png", GTK_TREE_STORE (tree), _("Folders"), - "dialogs/preferences/folders.html", + GIMP_HELP_PREFS_FOLDERS, NULL, &top_iter, page_index++); @@ -1915,39 +1916,39 @@ prefs_dialog_new (Gimp *gimp, paths[] = { { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", - "dialogs/preferences/folders.html#brushes", + GIMP_HELP_PREFS_FOLDERS_BRUSHES, N_("Select Brush Folders"), "brush-path" }, { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", - "dialogs/preferences/folders.html#patterns", + GIMP_HELP_PREFS_FOLDERS_PATTERNS, N_("Select Pattern Folders"), "pattern-path" }, { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", - "dialogs/preferences/folders.html#palettes", + GIMP_HELP_PREFS_FOLDERS_PALETTES, N_("Select Palette Folders"), "palette-path" }, { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", - "dialogs/preferences/folders.html#gradients", + GIMP_HELP_PREFS_FOLDERS_GRADIENTS, N_("Select Gradient Folders"), "gradient-path" }, { N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", - "dialogs/preferences/folders.html#plug_ins", + GIMP_HELP_PREFS_FOLDERS_PLUG_INS, N_("Select Plug-In Folders"), "plug-in-path" }, { N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png", - "dialogs/preferences/folders.html#scripts", + GIMP_HELP_PREFS_FOLDERS_SCRIPTS, N_("Select Script-Fu Folders"), "script-fu-path" }, { N_("Modules"), N_("Module Folders"), "folders-modules.png", - "dialogs/preferences/folders.html#modules", + GIMP_HELP_PREFS_FOLDERS_MODULES, N_("Select Module Folders"), "module-path" }, { N_("Environment"), N_("Environment Folders"), "folders-environ.png", - "dialogs/preferences/folders.html#environ", + GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT, N_("Select Environment Folders"), "environ-path" }, { N_("Themes"), N_("Theme Folders"), "folders-themes.png", - "dialogs/preferences/folders.html#themes", + GIMP_HELP_PREFS_FOLDERS_THEMES, N_("Select Theme Folders"), "theme-path" } }; diff --git a/app/gui/qmask-commands.c b/app/gui/qmask-commands.c index 987d434af8..d7a4932ed8 100644 --- a/app/gui/qmask-commands.c +++ b/app/gui/qmask-commands.c @@ -31,6 +31,7 @@ #include "core/gimpimage-qmask.h" #include "widgets/gimpcolorpanel.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -56,7 +57,7 @@ struct _EditQmaskOptions /* local function prototypes */ static void qmask_channel_query (GimpDisplayShell *shell); -static void qmask_query_ok_callback (GtkWidget *widget, +static void qmask_query_ok_callback (GtkWidget *widget, gpointer client_data); static void qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data); @@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell) options->gimage = shell->gdisp->gimage; options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), &options->gimage->qmask_color, - GIMP_COLOR_AREA_LARGE_CHECKS, + GIMP_COLOR_AREA_LARGE_CHECKS, 48, 64); gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_get_user_context (options->gimage->gimp)); @@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell) GIMP_STOCK_QMASK_ON, _("Edit QuickMask Attributes"), gimp_standard_help_func, - "dialogs/edit_qmask_attributes.html", + GIMP_HELP_QMASK_EDIT, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, @@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell) /* The opacity scale */ opacity_scale_data = - gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, + gtk_adjustment_new (options->gimage->qmask_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); gtk_widget_set_size_request (opacity_scale, 100, -1); @@ -202,14 +203,14 @@ qmask_channel_query (GimpDisplayShell *shell) g_signal_connect (options->color_panel, "color_changed", G_CALLBACK (qmask_query_color_changed), - opacity_scale_data); + opacity_scale_data); gtk_widget_show (options->query_box); } -static void -qmask_query_ok_callback (GtkWidget *widget, - gpointer data) +static void +qmask_query_ok_callback (GtkWidget *widget, + gpointer data) { EditQmaskOptions *options; GimpChannel *channel; @@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget, gtk_widget_destroy (options->query_box); } -static void -qmask_query_scale_update (GtkAdjustment *adjustment, +static void +qmask_query_scale_update (GtkAdjustment *adjustment, gpointer data) { GimpRGB color; diff --git a/app/gui/qmask-menu.c b/app/gui/qmask-menu.c index 200ff21c48..d141b0f4aa 100644 --- a/app/gui/qmask-menu.c +++ b/app/gui/qmask-menu.c @@ -26,6 +26,7 @@ #include "core/gimpimage.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "display/gimpdisplay.h" @@ -42,22 +43,26 @@ GimpItemFactoryEntry qmask_menu_entries[] = { { { N_("/_QMask Active"), NULL, qmask_toggle_cmd_callback, 0, "" }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_QMASK_TOGGLE, NULL }, MENU_SEPARATOR ("/---"), { { N_("/Mask _Selected Areas"), NULL, qmask_invert_cmd_callback, TRUE, "" }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_QMASK_INVERT, NULL }, { { N_("/Mask _Unselected Areas"), NULL, qmask_invert_cmd_callback, FALSE, "/Mask Selected Areas" }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_QMASK_INVERT, NULL }, MENU_SEPARATOR ("/---"), { { N_("/_Configure Color and Opacity..."), NULL, qmask_configure_cmd_callback, 0 }, - NULL, NULL, NULL } + NULL, + GIMP_HELP_QMASK_EDIT, NULL } }; gint n_qmask_menu_entries = G_N_ELEMENTS (qmask_menu_entries); diff --git a/app/gui/templates-commands.c b/app/gui/templates-commands.c index cc3b2acdcc..e2df5e1afe 100644 --- a/app/gui/templates-commands.c +++ b/app/gui/templates-commands.c @@ -32,6 +32,7 @@ #include "core/gimptemplate.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimptemplateeditor.h" #include "widgets/gimptemplateview.h" #include "widgets/gimpviewabledialog.h" @@ -133,7 +134,7 @@ templates_new_template_dialog (Gimp *gimp, GIMP_STOCK_TEMPLATE, _("Create a New Template"), gimp_standard_help_func, - "dialogs/new_template.html", + GIMP_HELP_TEMPLATE_NEW, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, (gpointer) 1, NULL, FALSE, TRUE, @@ -202,7 +203,7 @@ templates_edit_template_dialog (Gimp *gimp, GIMP_STOCK_EDIT, _("Edit Template"), gimp_standard_help_func, - "dialogs/edit_template.html", + GIMP_HELP_TEMPLATE_EDIT, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, (gpointer) 1, NULL, FALSE, TRUE, diff --git a/app/gui/toolbox-menu.c b/app/gui/toolbox-menu.c index 5cef51d3b9..298bbf2c09 100644 --- a/app/gui/toolbox-menu.c +++ b/app/gui/toolbox-menu.c @@ -84,7 +84,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_toplevel_cmd_callback, 0, "", GTK_STOCK_PREFERENCES }, "gimp-preferences-dialog", - GIMP_HELP_PREFERENCES_DIALOG, NULL }, + GIMP_HELP_PREFS_DIALOG, NULL }, /* /File/Dialogs */ diff --git a/app/gui/vectors-menu.c b/app/gui/vectors-menu.c index 3735837111..d4a287dd34 100644 --- a/app/gui/vectors-menu.c +++ b/app/gui/vectors-menu.c @@ -73,22 +73,22 @@ GimpItemFactoryEntry vectors_menu_entries[] = vectors_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_PATH_SEL_REPLACE, NULL }, + GIMP_HELP_PATH_SELECTION_REPLACE, NULL }, { { N_("/_Add to Selection"), NULL, vectors_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_PATH_SEL_ADD, NULL }, + GIMP_HELP_PATH_SELECTION_ADD, NULL }, { { N_("/_Subtract from Selection"), NULL, vectors_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_PATH_SEL_SUB, NULL }, + GIMP_HELP_PATH_SELECTION_SUBTRACT, NULL }, { { N_("/_Intersect with Selection"), NULL, vectors_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_PATH_SEL_INTERSECT, NULL }, + GIMP_HELP_PATH_SELECTION_INTERSECT, NULL }, { { N_("/Selecti_on to Path"), "P", vectors_selection_to_vectors_cmd_callback, 0, diff --git a/app/menus/file-open-menu.c b/app/menus/file-open-menu.c index aed1a74669..7701fd947e 100644 --- a/app/menus/file-open-menu.c +++ b/app/menus/file-open-menu.c @@ -30,6 +30,7 @@ #include "plug-in/plug-in-proc.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "file-commands.h" @@ -44,14 +45,14 @@ GimpItemFactoryEntry file_open_menu_entries[] = { { N_("/Automatic"), NULL, file_open_by_extension_cmd_callback, 0 }, NULL, - "open_by_extension.html", NULL }, + GIMP_HELP_FILE_OPEN_BY_EXTENSION, NULL }, MENU_SEPARATOR ("/---") }; gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries); - + void file_open_menu_setup (GimpItemFactory *factory) { diff --git a/app/menus/file-save-menu.c b/app/menus/file-save-menu.c index 2aaf262c96..43ecfe713b 100644 --- a/app/menus/file-save-menu.c +++ b/app/menus/file-save-menu.c @@ -31,6 +31,7 @@ #include "plug-in/plug-in-proc.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "file-commands.h" @@ -45,7 +46,7 @@ GimpItemFactoryEntry file_save_menu_entries[] = { { N_("/By Extension"), NULL, file_save_by_extension_cmd_callback, 0 }, NULL, - "save_by_extension.html", NULL }, + GIMP_HELP_FILE_SAVE_BY_EXTENSION, NULL }, MENU_SEPARATOR ("/---") }; diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c index 74aa0f10a8..e954082be5 100644 --- a/app/menus/image-menu.c +++ b/app/menus/image-menu.c @@ -314,7 +314,7 @@ GimpItemFactoryEntry image_menu_entries[] = select_toggle_quickmask_cmd_callback, 0, "", GIMP_STOCK_QMASK_ON }, NULL, - GIMP_HELP_SELECT_QUICKMASK, NULL }, + GIMP_HELP_QMASK_TOGGLE, NULL }, { { N_("/Select/Save to _Channel"), NULL, select_save_cmd_callback, 0, "", GIMP_STOCK_SELECTION_TO_CHANNEL }, @@ -753,22 +753,22 @@ GimpItemFactoryEntry image_menu_entries[] = layers_mask_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL }, { { N_("/Layer/Mask/_Add to Selection"), NULL, layers_mask_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_LAYER_MASK_SEL_ADD, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_ADD, NULL }, { { N_("/Layer/Mask/_Subtract from Selection"), NULL, layers_mask_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_LAYER_MASK_SEL_SUB, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT, NULL }, { { N_("/Layer/Mask/_Intersect with Selection"), NULL, layers_mask_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_LAYER_MASK_SEL_INTERSECT, NULL }, + GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT, NULL }, /* /Layer/Transparency */ @@ -785,22 +785,22 @@ GimpItemFactoryEntry image_menu_entries[] = layers_alpha_selection_replace_cmd_callback, 0, "", GIMP_STOCK_SELECTION_REPLACE }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL }, { { N_("/Layer/Transparency/A_dd to Selection"), NULL, layers_alpha_selection_add_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ADD }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_ADD, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_ADD, NULL }, { { N_("/Layer/Transparency/_Subtract from Selection"), NULL, layers_alpha_selection_sub_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SUBTRACT }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_SUB, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT, NULL }, { { N_("/Layer/Transparency/_Intersect with Selection"), NULL, layers_alpha_selection_intersect_cmd_callback, 0, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT, NULL }, + GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT, NULL }, MENU_SEPARATOR ("/Layer/Transparency/---"), diff --git a/app/menus/menus.c b/app/menus/menus.c index 638a0a23f7..f40071c14f 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -33,6 +33,7 @@ #include "file/file-utils.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "widgets/gimpmenufactory.h" @@ -297,7 +298,7 @@ menus_last_opened_add (GimpItemFactory *item_factory, for (i = 0; i < n; i++) { - last_opened_entries[i].entry.path = + last_opened_entries[i].entry.path = g_strdup_printf ("/File/Open Recent/%02d", i + 1); if (i < 9) @@ -311,7 +312,7 @@ menus_last_opened_add (GimpItemFactory *item_factory, last_opened_entries[i].entry.item_type = ""; last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN; last_opened_entries[i].quark_string = NULL; - last_opened_entries[i].help_page = "file/last_opened.html"; + last_opened_entries[i].help_page = GIMP_HELP_FILE_OPEN_RECENT; last_opened_entries[i].description = NULL; } @@ -371,7 +372,7 @@ menus_filters_subdirs_to_top (GtkMenu *menu) { menu_item = GTK_MENU_ITEM (list->data); items++; - + if (menu_item->submenu) { if (submenus_passed) diff --git a/app/menus/toolbox-menu.c b/app/menus/toolbox-menu.c index 5cef51d3b9..298bbf2c09 100644 --- a/app/menus/toolbox-menu.c +++ b/app/menus/toolbox-menu.c @@ -84,7 +84,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_toplevel_cmd_callback, 0, "", GTK_STOCK_PREFERENCES }, "gimp-preferences-dialog", - GIMP_HELP_PREFERENCES_DIALOG, NULL }, + GIMP_HELP_PREFS_DIALOG, NULL }, /* /File/Dialogs */ diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 289108474a..b637924b8c 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -43,6 +43,8 @@ #include "paint/gimppaintoptions.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpinkoptions.h" @@ -105,19 +107,19 @@ static gdouble dist_smoother_result (GimpInkTool *ink_tool); static void dist_smoother_init (GimpInkTool *ink_tool, gdouble initval); -static void ink_init (GimpInkTool *ink_tool, - GimpDrawable *drawable, - gdouble x, +static void ink_init (GimpInkTool *ink_tool, + GimpDrawable *drawable, + gdouble x, gdouble y); -static void ink_finish (GimpInkTool *ink_tool, +static void ink_finish (GimpInkTool *ink_tool, GimpDrawable *drawable); static void ink_cleanup (void); /* Rendering functions */ -static void ink_set_paint_area (GimpInkTool *ink_tool, - GimpDrawable *drawable, +static void ink_set_paint_area (GimpInkTool *ink_tool, + GimpDrawable *drawable, Blob *blob); -static void ink_paste (GimpInkTool *ink_tool, +static void ink_paste (GimpInkTool *ink_tool, GimpDrawable *drawable, Blob *blob); @@ -126,13 +128,13 @@ static void ink_to_canvas_tiles (GimpInkTool *ink_tool, guchar *color); static void ink_set_undo_tiles (GimpDrawable *drawable, - gint x, + gint x, gint y, - gint w, + gint w, gint h); -static void ink_set_canvas_tiles (gint x, +static void ink_set_canvas_tiles (gint x, gint y, - gint w, + gint w, gint h); @@ -167,7 +169,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback, _("Ink"), _("Draw in ink"), N_("/Tools/Paint Tools/In_k"), "K", - NULL, "tools/ink.html", + NULL, GIMP_HELP_TOOL_INK, GIMP_STOCK_TOOL_INK, data); } @@ -193,7 +195,7 @@ gimp_ink_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TOOL, - "GimpInkTool", + "GimpInkTool", &tool_info, 0); } @@ -309,7 +311,7 @@ gimp_ink_tool_button_press (GimpTool *tool, ink_init (ink_tool, drawable, curr_coords.x, curr_coords.y); gimp_tool_control_activate (tool->control); - tool->gdisp = gdisp; + tool->gdisp = gdisp; /* pause the current selection */ gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_PAUSE); @@ -447,7 +449,7 @@ gimp_ink_tool_motion (GimpTool *tool, g_free (ink_tool->last_blob); ink_tool->last_blob = b; - ink_paste (ink_tool, drawable, blob_union); + ink_paste (ink_tool, drawable, blob_union); g_free (blob_union); gimp_display_flush_now (gdisp); @@ -510,7 +512,7 @@ ink_pen_ellipse (GimpInkOptions *options, #ifdef VERBOSE g_print ("%f (%f) -> ", (float)size, (float)velocity); -#endif +#endif size = (options->vel_sensitivity * ((4.5 * size) / (1.0 + options->vel_sensitivity * (2.0 * velocity))) @@ -583,7 +585,7 @@ ink_pen_ellipse (GimpInkOptions *options, return (* function) (x_center * SUBSAMPLE, y_center * SUBSAMPLE, radmin * aspect * tcos, - radmin * aspect * tsin, + radmin * aspect * tsin, -radmin * tsin, radmin * tcos); } @@ -671,7 +673,7 @@ time_smoother_add (GimpInkTool *ink_tool, static void ink_init (GimpInkTool *ink_tool, - GimpDrawable *drawable, + GimpDrawable *drawable, gdouble x, gdouble y) { @@ -744,7 +746,7 @@ ink_cleanup (void) * Rendering functions * *********************************/ -/* Some of this stuff should probably be combined with the +/* Some of this stuff should probably be combined with the * code it was copied from in paint_core.c; but I wanted * to learn this stuff, so I've kept it simple. * @@ -754,8 +756,8 @@ ink_cleanup (void) */ static void -ink_set_paint_area (GimpInkTool *ink_tool, - GimpDrawable *drawable, +ink_set_paint_area (GimpInkTool *ink_tool, + GimpDrawable *drawable, Blob *blob) { GimpItem *item = GIMP_ITEM (drawable); @@ -846,7 +848,7 @@ render_blob_line (Blob *blob, gint last_x; /* Sort start and ends for all lines */ - + j = y * SUBSAMPLE - blob->y; for (i = 0; i < SUBSAMPLE; i++) { @@ -890,7 +892,7 @@ render_blob_line (Blob *blob, while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width))) n--; - + /* Render the row */ last_x = 0; @@ -904,7 +906,7 @@ render_blob_line (Blob *blob, fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x); /* Compute the value for this pixel */ - pixel = current * SUBSAMPLE; + pixel = current * SUBSAMPLE; while (ih; @@ -962,7 +964,7 @@ render_blob (PixelRegion *dest, } static void -ink_paste (GimpInkTool *ink_tool, +ink_paste (GimpInkTool *ink_tool, GimpDrawable *drawable, Blob *blob) { @@ -979,7 +981,7 @@ ink_paste (GimpInkTool *ink_tool, /* Get the the buffer */ ink_set_paint_area (ink_tool, drawable, blob); - + /* check to make sure there is actually a canvas to draw on */ if (!canvas_buf) return; @@ -1117,8 +1119,8 @@ ink_set_canvas_tiles (gint x, if (tile_is_valid (tile) == FALSE) { tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE); - memset (tile_data_pointer (tile, 0, 0), - 0, + memset (tile_data_pointer (tile, 0, 0), + 0, tile_size (tile)); tile_release (tile, TRUE); } diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c index c2cf216b92..4e5f529323 100644 --- a/app/tools/gimpairbrushtool.c +++ b/app/tools/gimpairbrushtool.c @@ -29,6 +29,7 @@ #include "paint/gimpairbrush.h" #include "paint/gimpairbrushoptions.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "gimpairbrushtool.h" @@ -61,7 +62,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback callback, _("Airbrush"), _("Airbrush with variable pressure"), N_("/Tools/Paint Tools/_Airbrush"), "A", - NULL, "tools/airbrush.html", + NULL, GIMP_HELP_TOOL_AIRBRUSH, GIMP_STOCK_TOOL_AIRBRUSH, data); } diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c index 25d9cf44c4..b4abf3d8b8 100644 --- a/app/tools/gimpblendtool.c +++ b/app/tools/gimpblendtool.c @@ -34,6 +34,8 @@ #include "core/gimpimage.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpprogress.h" @@ -96,7 +98,7 @@ gimp_blend_tool_register (GimpToolRegisterCallback callback, _("Blend"), _("Fill with a color gradient"), N_("/Tools/Paint Tools/Blen_d"), "L", - NULL, "tools/blend.html", + NULL, GIMP_HELP_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND, data); } diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c index 990fbe1f8b..155420bbdb 100644 --- a/app/tools/gimpbrightnesscontrasttool.c +++ b/app/tools/gimpbrightnesscontrasttool.c @@ -32,6 +32,8 @@ #include "core/gimpimage.h" #include "core/gimpimagemap.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpbrightnesscontrasttool.h" @@ -82,7 +84,7 @@ gimp_brightness_contrast_tool_register (GimpToolRegisterCallback callback, _("Brightness-Contrast"), _("Adjust brightness and contrast"), N_("/Tools/Color Tools/B_rightness-Contrast..."), NULL, - NULL, "tools/brightness_contrast.html", + NULL, GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST, GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, data); } @@ -108,7 +110,7 @@ gimp_brightness_contrast_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpBrightnessContrastTool", + "GimpBrightnessContrastTool", &tool_info, 0); } diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index 0e16dfdc65..a492e3f9bc 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -34,6 +34,8 @@ #include "core/gimpimage-mask.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpbucketfilloptions.h" @@ -76,7 +78,7 @@ static void gimp_bucket_fill_tool_cursor_update (GimpTool *tool, void gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback, - gpointer data) + gpointer data) { (* callback) (GIMP_TYPE_BUCKET_FILL_TOOL, GIMP_TYPE_BUCKET_FILL_OPTIONS, @@ -88,7 +90,7 @@ gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback, _("Bucket Fill"), _("Fill with a color or pattern"), N_("/Tools/Paint Tools/_Bucket Fill"), "B", - NULL, "tools/bucket_fill.html", + NULL, GIMP_HELP_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL, data); } @@ -114,7 +116,7 @@ gimp_bucket_fill_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TOOL, - "GimpBucketFillTool", + "GimpBucketFillTool", &tool_info, 0); } diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index f987b5dad7..2499837f22 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -31,6 +31,8 @@ #include "core/gimpimage-projection.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpbycolorselecttool.h" @@ -80,7 +82,7 @@ gimp_by_color_select_tool_register (GimpToolRegisterCallback callback, _("Select By Color"), _("Select regions by color"), N_("/Tools/Selection Tools/_By Color Select"), NULL, - NULL, "tools/by_color_select.html", + NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT, GIMP_STOCK_TOOL_BY_COLOR_SELECT, data); } diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c index e65baedbde..915d056b0d 100644 --- a/app/tools/gimpclonetool.c +++ b/app/tools/gimpclonetool.c @@ -32,10 +32,11 @@ #include "paint/gimpclone.h" #include "paint/gimpcloneoptions.h" -#include "display/gimpdisplay.h" - +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" +#include "display/gimpdisplay.h" + #include "gimpclonetool.h" #include "gimppaintoptions-gui.h" #include "gimptoolcontrol.h" @@ -98,7 +99,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback callback, _("Clone"), _("Paint using Patterns or Image Regions"), N_("/Tools/Paint Tools/_Clone"), "C", - NULL, "tools/clone.html", + NULL, GIMP_HELP_TOOL_CLONE, GIMP_STOCK_TOOL_CLONE, data); } diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index 55d016b244..d8327e2196 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -32,10 +32,11 @@ #include "core/gimpimage.h" #include "core/gimpimagemap.h" -#include "display/gimpdisplay.h" - +#include "widgets/gimphelp-ids.h" #include "widgets/gimpenummenu.h" +#include "display/gimpdisplay.h" + #include "gimpcolorbalancetool.h" #include "gimp-intl.h" @@ -94,7 +95,7 @@ gimp_color_balance_tool_register (GimpToolRegisterCallback callback, _("Color Balance"), _("Adjust color balance"), N_("/Tools/Color Tools/Color _Balance..."), NULL, - NULL, "tools/color_balance.html", + NULL, GIMP_HELP_TOOL_COLOR_BALANCE, GIMP_STOCK_TOOL_COLOR_BALANCE, data); } diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c index 357472a75e..bff1df30ff 100644 --- a/app/tools/gimpcolorizetool.c +++ b/app/tools/gimpcolorizetool.c @@ -32,6 +32,8 @@ #include "core/gimpimage.h" #include "core/gimpimagemap.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpcolorizetool.h" @@ -93,7 +95,7 @@ gimp_colorize_tool_register (GimpToolRegisterCallback callback, _("Colorize"), _("Colorize the image"), N_("/Tools/Color Tools/Colori_ze..."), NULL, - NULL, "tools/colorize.html", + NULL, GIMP_HELP_TOOL_COLORIZE, GIMP_STOCK_TOOL_COLORIZE, data); } @@ -119,7 +121,7 @@ gimp_colorize_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpColorizeTool", + "GimpColorizeTool", &tool_info, 0); } diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 1c05e5db2d..11eaa1aca5 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -36,6 +36,7 @@ #include "core/gimptoolinfo.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppaletteeditor.h" #include "widgets/gimptoolbox-color-area.h" #include "widgets/gimpviewabledialog.h" @@ -102,7 +103,7 @@ gimp_color_picker_tool_register (GimpToolRegisterCallback callback, _("Color Picker"), _("Pick colors from the image"), N_("/Tools/C_olor Picker"), "O", - NULL, "tools/color_picker.html", + NULL, GIMP_HELP_TOOL_COLOR_PICKER, GIMP_STOCK_TOOL_COLOR_PICKER, data); } diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c index 4b0fb0ab4d..d9fa7361e0 100644 --- a/app/tools/gimpconvolvetool.c +++ b/app/tools/gimpconvolvetool.c @@ -40,6 +40,7 @@ #include "paint/gimpconvolve.h" #include "paint/gimpconvolveoptions.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -90,7 +91,7 @@ gimp_convolve_tool_register (GimpToolRegisterCallback callback, _("Convolve"), _("Blur or Sharpen"), N_("/Tools/Paint Tools/Con_volve"), "V", - NULL, "tools/convolve.html", + NULL, GIMP_HELP_TOOL_CONVOLVE, GIMP_STOCK_TOOL_BLUR, data); } diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index d9f95aa078..6ce9c1cebe 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -33,16 +33,17 @@ #include "core/gimpimage-mask.h" #include "core/gimptoolinfo.h" +#include "widgets/gimpdialogfactory.h" +#include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" +#include "widgets/gimpviewabledialog.h" +#include "widgets/gimpwidgets-utils.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplay-foreach.h" #include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell-transform.h" -#include "widgets/gimpdialogfactory.h" -#include "widgets/gimpenummenu.h" -#include "widgets/gimpviewabledialog.h" -#include "widgets/gimpwidgets-utils.h" - #ifdef __GNUC__ #warning FIXME #include "gui/gui-types.h" #endif @@ -162,7 +163,7 @@ gimp_crop_tool_register (GimpToolRegisterCallback callback, _("Crop & Resize"), _("Crop or Resize an image"), N_("/Tools/Transform Tools/_Crop & Resize"), "C", - NULL, "tools/crop_tool.html", + NULL, GIMP_HELP_TOOL_CROP, GIMP_STOCK_TOOL_CROP, data); } diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 74aa65dbcd..297ac67fb2 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -48,6 +48,7 @@ #include "widgets/gimpcursor.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" #include "display/gimpdisplay.h" @@ -159,7 +160,7 @@ gimp_curves_tool_register (GimpToolRegisterCallback callback, _("Curves"), _("Adjust color curves"), N_("/Tools/Color Tools/_Curves..."), NULL, - NULL, "tools/curves.html", + NULL, GIMP_HELP_TOOL_CURVES, GIMP_STOCK_TOOL_CURVES, data); } diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c index 2f439ab27b..a4c5e51dd3 100644 --- a/app/tools/gimpdodgeburntool.c +++ b/app/tools/gimpdodgeburntool.c @@ -29,6 +29,7 @@ #include "paint/gimpdodgeburn.h" #include "paint/gimpdodgeburnoptions.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -70,7 +71,7 @@ gimp_dodgeburn_tool_register (GimpToolRegisterCallback callback, _("Dodge/Burn"), _("Dodge or Burn strokes"), N_("/Tools/Paint Tools/Dod_geBurn"), "D", - NULL, "tools/dodgeburn.html", + NULL, GIMP_HELP_TOOL_DODGE_BURN, GIMP_STOCK_TOOL_DODGE, data); } diff --git a/app/tools/gimpellipseselecttool.c b/app/tools/gimpellipseselecttool.c index 5426a8c4cf..c088ad46c9 100644 --- a/app/tools/gimpellipseselecttool.c +++ b/app/tools/gimpellipseselecttool.c @@ -32,6 +32,8 @@ #include "core/gimpimage-mask-select.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpellipseselecttool.h" @@ -60,7 +62,7 @@ static GimpRectSelectToolClass *parent_class = NULL; void gimp_ellipse_select_tool_register (GimpToolRegisterCallback callback, - gpointer data) + gpointer data) { (* callback) (GIMP_TYPE_ELLIPSE_SELECT_TOOL, GIMP_TYPE_SELECTION_OPTIONS, @@ -70,7 +72,7 @@ gimp_ellipse_select_tool_register (GimpToolRegisterCallback callback, _("Ellipse Select"), _("Select elliptical regions"), N_("/Tools/Selection Tools/_Ellipse Select"), "E", - NULL, "tools/ellipse_select.html", + NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT, GIMP_STOCK_TOOL_ELLIPSE_SELECT, data); } @@ -96,7 +98,7 @@ gimp_ellipse_select_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_RECT_SELECT_TOOL, - "GimpEllipseSelectTool", + "GimpEllipseSelectTool", &tool_info, 0); } diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c index d6d475d506..2b6da7517b 100644 --- a/app/tools/gimperasertool.c +++ b/app/tools/gimperasertool.c @@ -29,6 +29,7 @@ #include "paint/gimperaser.h" #include "paint/gimperaseroptions.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -70,7 +71,7 @@ gimp_eraser_tool_register (GimpToolRegisterCallback callback, _("Eraser"), _("Erase to background or transparency"), N_("/Tools/Paint Tools/_Eraser"), "E", - NULL, "tools/eraser.html", + NULL, GIMP_HELP_TOOL_ERASER, GIMP_STOCK_TOOL_ERASER, data); } diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index 5e3adce1cf..64c3233099 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -36,6 +36,7 @@ #include "core/gimpitem-linked.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpwidgets-utils.h" #include "display/gimpdisplay.h" @@ -72,7 +73,7 @@ static GimpTransformToolClass *parent_class = NULL; /* public functions */ -void +void gimp_flip_tool_register (GimpToolRegisterCallback callback, gpointer data) { @@ -84,7 +85,7 @@ gimp_flip_tool_register (GimpToolRegisterCallback callback, _("Flip"), _("Flip the layer or selection"), N_("/Tools/Transform Tools/_Flip"), "F", - NULL, "tools/flip.html", + NULL, GIMP_HELP_TOOL_FLIP, GIMP_STOCK_TOOL_FLIP, data); } @@ -110,7 +111,7 @@ gimp_flip_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, - "GimpFlipTool", + "GimpFlipTool", &tool_info, 0); } diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 75523e1149..1714143e4e 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -36,6 +36,8 @@ #include "core/gimplayer-floating-sel.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpeditselectiontool.h" @@ -96,7 +98,7 @@ gimp_free_select_tool_register (GimpToolRegisterCallback callback, _("Free Select"), _("Select hand-drawn regions"), N_("/Tools/Selection Tools/_Free Select"), "F", - NULL, "tools/free_select.html", + NULL, GIMP_HELP_TOOL_FREE_SELECT, GIMP_STOCK_TOOL_FREE_SELECT, data); } @@ -122,7 +124,7 @@ gimp_free_select_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, - "GimpFreeSelectTool", + "GimpFreeSelectTool", &tool_info, 0); } diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c index aebaab7362..1bece76fa4 100644 --- a/app/tools/gimpfuzzyselecttool.c +++ b/app/tools/gimpfuzzyselecttool.c @@ -39,6 +39,8 @@ #include "core/gimplayer-floating-sel.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell-cursor.h" @@ -98,7 +100,7 @@ gimp_fuzzy_select_tool_register (GimpToolRegisterCallback callback, _("Fuzzy Select"), _("Select contiguous regions"), N_("/Tools/Selection Tools/Fu_zzy Select"), "Z", - NULL, "tools/fuzzy_select.html", + NULL, GIMP_HELP_TOOL_FUZZY_SELECT, GIMP_STOCK_TOOL_FUZZY_SELECT, data); } diff --git a/app/tools/gimphistogramtool.c b/app/tools/gimphistogramtool.c index cfee4ce23a..e794bbfbe5 100644 --- a/app/tools/gimphistogramtool.c +++ b/app/tools/gimphistogramtool.c @@ -37,6 +37,7 @@ #include "widgets/gimpenummenu.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimphistogrambox.h" #include "widgets/gimphistogramview.h" #include "widgets/gimppropwidgets.h" @@ -90,7 +91,7 @@ static HistogramToolDialog * histogram_tool_dialog_new (GimpToolInfo *tool_info static void histogram_tool_close_callback (GtkWidget *widget, gpointer data); -static gboolean histogram_set_sensitive_callback +static gboolean histogram_set_sensitive_callback (gpointer item_data, HistogramToolDialog *htd); static void histogram_tool_dialog_update (HistogramToolDialog *htd, @@ -121,7 +122,7 @@ gimp_histogram_tool_register (GimpToolRegisterCallback callback, _("Histogram"), _("View image histogram"), N_("/Tools/Color Tools/_Histogram..."), NULL, - NULL, "tools/histogram.html", + NULL, GIMP_HELP_TOOL_HISTOGRAM, GIMP_STOCK_TOOL_HISTOGRAM, data); } @@ -147,7 +148,7 @@ gimp_histogram_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpHistogramTool", + "GimpHistogramTool", &tool_info, 0); } @@ -460,7 +461,7 @@ histogram_set_sensitive_callback (gpointer item_data, HistogramToolDialog *htd) { GimpHistogramChannel channel = GPOINTER_TO_INT (item_data); - + switch (channel) { case GIMP_HISTOGRAM_VALUE: @@ -472,6 +473,6 @@ histogram_set_sensitive_callback (gpointer item_data, case GIMP_HISTOGRAM_ALPHA: return gimp_drawable_has_alpha (htd->drawable); } - + return FALSE; } diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 1c820a1db4..f6ada6c8d8 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -32,6 +32,8 @@ #include "core/gimpimage.h" #include "core/gimpimagemap.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimphuesaturationtool.h" @@ -107,7 +109,7 @@ gimp_hue_saturation_tool_register (GimpToolRegisterCallback callback, _("Hue-Saturation"), _("Adjust hue and saturation"), N_("/Tools/Color Tools/Hue-_Saturation..."), NULL, - NULL, "tools/hue_saturation.html", + NULL, GIMP_HELP_TOOL_HUE_SATURATION, GIMP_STOCK_TOOL_HUE_SATURATION, data); } @@ -133,7 +135,7 @@ gimp_hue_saturation_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpHueSaturationTool", + "GimpHueSaturationTool", &tool_info, 0); } diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index 289108474a..b637924b8c 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -43,6 +43,8 @@ #include "paint/gimppaintoptions.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpinkoptions.h" @@ -105,19 +107,19 @@ static gdouble dist_smoother_result (GimpInkTool *ink_tool); static void dist_smoother_init (GimpInkTool *ink_tool, gdouble initval); -static void ink_init (GimpInkTool *ink_tool, - GimpDrawable *drawable, - gdouble x, +static void ink_init (GimpInkTool *ink_tool, + GimpDrawable *drawable, + gdouble x, gdouble y); -static void ink_finish (GimpInkTool *ink_tool, +static void ink_finish (GimpInkTool *ink_tool, GimpDrawable *drawable); static void ink_cleanup (void); /* Rendering functions */ -static void ink_set_paint_area (GimpInkTool *ink_tool, - GimpDrawable *drawable, +static void ink_set_paint_area (GimpInkTool *ink_tool, + GimpDrawable *drawable, Blob *blob); -static void ink_paste (GimpInkTool *ink_tool, +static void ink_paste (GimpInkTool *ink_tool, GimpDrawable *drawable, Blob *blob); @@ -126,13 +128,13 @@ static void ink_to_canvas_tiles (GimpInkTool *ink_tool, guchar *color); static void ink_set_undo_tiles (GimpDrawable *drawable, - gint x, + gint x, gint y, - gint w, + gint w, gint h); -static void ink_set_canvas_tiles (gint x, +static void ink_set_canvas_tiles (gint x, gint y, - gint w, + gint w, gint h); @@ -167,7 +169,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback, _("Ink"), _("Draw in ink"), N_("/Tools/Paint Tools/In_k"), "K", - NULL, "tools/ink.html", + NULL, GIMP_HELP_TOOL_INK, GIMP_STOCK_TOOL_INK, data); } @@ -193,7 +195,7 @@ gimp_ink_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TOOL, - "GimpInkTool", + "GimpInkTool", &tool_info, 0); } @@ -309,7 +311,7 @@ gimp_ink_tool_button_press (GimpTool *tool, ink_init (ink_tool, drawable, curr_coords.x, curr_coords.y); gimp_tool_control_activate (tool->control); - tool->gdisp = gdisp; + tool->gdisp = gdisp; /* pause the current selection */ gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_PAUSE); @@ -447,7 +449,7 @@ gimp_ink_tool_motion (GimpTool *tool, g_free (ink_tool->last_blob); ink_tool->last_blob = b; - ink_paste (ink_tool, drawable, blob_union); + ink_paste (ink_tool, drawable, blob_union); g_free (blob_union); gimp_display_flush_now (gdisp); @@ -510,7 +512,7 @@ ink_pen_ellipse (GimpInkOptions *options, #ifdef VERBOSE g_print ("%f (%f) -> ", (float)size, (float)velocity); -#endif +#endif size = (options->vel_sensitivity * ((4.5 * size) / (1.0 + options->vel_sensitivity * (2.0 * velocity))) @@ -583,7 +585,7 @@ ink_pen_ellipse (GimpInkOptions *options, return (* function) (x_center * SUBSAMPLE, y_center * SUBSAMPLE, radmin * aspect * tcos, - radmin * aspect * tsin, + radmin * aspect * tsin, -radmin * tsin, radmin * tcos); } @@ -671,7 +673,7 @@ time_smoother_add (GimpInkTool *ink_tool, static void ink_init (GimpInkTool *ink_tool, - GimpDrawable *drawable, + GimpDrawable *drawable, gdouble x, gdouble y) { @@ -744,7 +746,7 @@ ink_cleanup (void) * Rendering functions * *********************************/ -/* Some of this stuff should probably be combined with the +/* Some of this stuff should probably be combined with the * code it was copied from in paint_core.c; but I wanted * to learn this stuff, so I've kept it simple. * @@ -754,8 +756,8 @@ ink_cleanup (void) */ static void -ink_set_paint_area (GimpInkTool *ink_tool, - GimpDrawable *drawable, +ink_set_paint_area (GimpInkTool *ink_tool, + GimpDrawable *drawable, Blob *blob) { GimpItem *item = GIMP_ITEM (drawable); @@ -846,7 +848,7 @@ render_blob_line (Blob *blob, gint last_x; /* Sort start and ends for all lines */ - + j = y * SUBSAMPLE - blob->y; for (i = 0; i < SUBSAMPLE; i++) { @@ -890,7 +892,7 @@ render_blob_line (Blob *blob, while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width))) n--; - + /* Render the row */ last_x = 0; @@ -904,7 +906,7 @@ render_blob_line (Blob *blob, fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x); /* Compute the value for this pixel */ - pixel = current * SUBSAMPLE; + pixel = current * SUBSAMPLE; while (ih; @@ -962,7 +964,7 @@ render_blob (PixelRegion *dest, } static void -ink_paste (GimpInkTool *ink_tool, +ink_paste (GimpInkTool *ink_tool, GimpDrawable *drawable, Blob *blob) { @@ -979,7 +981,7 @@ ink_paste (GimpInkTool *ink_tool, /* Get the the buffer */ ink_set_paint_area (ink_tool, drawable, blob); - + /* check to make sure there is actually a canvas to draw on */ if (!canvas_buf) return; @@ -1117,8 +1119,8 @@ ink_set_canvas_tiles (gint x, if (tile_is_valid (tile) == FALSE) { tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE); - memset (tile_data_pointer (tile, 0, 0), - 0, + memset (tile_data_pointer (tile, 0, 0), + 0, tile_size (tile)); tile_release (tile, TRUE); } diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index adf805504a..04dfc2e23e 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -71,6 +71,8 @@ #include "core/gimpscanconvert.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpiscissorstool.h" @@ -247,7 +249,7 @@ static gint vert_deriv[9] = -1, -2, -1, }; -static gint blur_32[9] = +static gint blur_32[9] = { 1, 1, 1, 1, 24, 1, @@ -278,7 +280,7 @@ gimp_iscissors_tool_register (GimpToolRegisterCallback callback, _("Select shapes from image"), N_("/Tools/Selection Tools/_Intelligent Scissors"), "I", - NULL, "tools/iscissors.html", + NULL, GIMP_HELP_TOOL_ISCISSORS, GIMP_STOCK_TOOL_ISCISSORS, data); } @@ -403,7 +405,7 @@ gimp_iscissors_tool_control (GimpTool *tool, switch (action) { - case PAUSE: + case PAUSE: break; case RESUME: @@ -567,7 +569,7 @@ iscissors_convert (GimpIscissorsTool *iscissors, iscissors->mask = gimp_scan_convert_to_channel (sc, gdisp->gimage); gimp_scan_convert_free (sc); - gimp_channel_invalidate_bounds (iscissors->mask); + gimp_channel_invalidate_bounds (iscissors->mask); } static void @@ -716,7 +718,7 @@ gimp_iscissors_tool_motion (GimpTool *tool, iscissors->x = coords->x; iscissors->y = coords->y; - + switch (iscissors->state) { case SEED_PLACEMENT: @@ -814,7 +816,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool) { if (iscissors->livewire->points) g_ptr_array_free (iscissors->livewire->points, TRUE); - + g_free (iscissors->livewire); iscissors->livewire = NULL; @@ -883,7 +885,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool) if (iscissors->curve1) { gimp_draw_tool_draw_line (draw_tool, - iscissors->curve1->x2, + iscissors->curve1->x2, iscissors->curve1->y2, iscissors->nx, iscissors->ny, @@ -892,7 +894,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool) if (iscissors->curve2) { gimp_draw_tool_draw_line (draw_tool, - iscissors->curve2->x1, + iscissors->curve2->x1, iscissors->curve2->y1, iscissors->nx, iscissors->ny, @@ -1221,7 +1223,7 @@ mouse_over_curve (GimpIscissorsTool *iscissors, gint tx, ty; /* traverse through the list, returning the curve segment's list element - * if the current cursor position is on a curve... + * if the current cursor position is on a curve... */ for (list = iscissors->curves; list; list = g_slist_next (list)) @@ -1366,7 +1368,7 @@ calculate_curve (GimpTool *tool, x2 = MAX (xs, xe) + 1; /* +1 because if xe = 199 & xs = 0, x2 - x1, width = 200 */ y2 = MAX (ys, ye) + 1; - /* expand the boundaries past the ending points by + /* expand the boundaries past the ending points by * some percentage of width and height. This serves the following purpose: * It gives the algorithm more area to search so better solutions * are found. This is particularly helpful in finding "bumps" which @@ -1404,13 +1406,13 @@ calculate_curve (GimpTool *tool, iscissors->gradient_map = gradient_map_new (gdisp->gimage); /* allocate the dynamic programming array */ - iscissors->dp_buf = + iscissors->dp_buf = temp_buf_resize (iscissors->dp_buf, 4, x1, y1, width, height); /* find the optimal path of pixels from (x1, y1) to (x2, y2) */ find_optimal_path (iscissors->gradient_map, iscissors->dp_buf, x1, y1, x2, y2, xs, ys); - + /* get a list of the pixels in the optimal path */ curve->points = plot_pixels (iscissors, iscissors->dp_buf, x1, y1, xs, ys, xe, ye); @@ -1419,7 +1421,7 @@ calculate_curve (GimpTool *tool, else if ((x2 - x1) == 0) { /* plot a vertical line */ - y = ys; + y = ys; dir = (ys > ye) ? -1 : 1; curve->points = g_ptr_array_new (); while (y != ye) @@ -1466,7 +1468,7 @@ gradient_map_value (TileManager *map, if (!cur_tile) return FALSE; cur_tilex = x / TILE_WIDTH; - cur_tiley = y / TILE_HEIGHT; + cur_tiley = y / TILE_HEIGHT; } p = tile_data_pointer (cur_tile, x % TILE_WIDTH, y % TILE_HEIGHT); @@ -1509,7 +1511,7 @@ calculate_link (TileManager *gradient_map, { grad2 = 0; dir2 = 255; - } + } value += (direction_value[dir1][link] + direction_value[dir2][link]) * OMEGA_D; @@ -1668,7 +1670,7 @@ find_optimal_path (TileManager *gradient_map, /* possibly change the links from the other pixels to this pixel... * these changes occur if a neighboring pixel will receive a lower - * cumulative cost by going through this pixel. + * cumulative cost by going through this pixel. */ for (k = 0; k < 8; k ++) if (pixel[k] && k != link) @@ -1685,7 +1687,7 @@ find_optimal_path (TileManager *gradient_map, d[offset] = (new_cost << 8) + ((k > 3) ? k - 4 : k + 4); } } - } + } /* Set the seed point */ else if (!i && !j) *d = SEED_POINT; @@ -1746,7 +1748,7 @@ gradmap_tile_validate (TileManager *tm, x, y, TRUE, FALSE); if (!srctile) return; - + sw = tile_ewidth (srctile); sh = tile_eheight (srctile); diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index 8daf385be9..78131b3823 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -50,6 +50,7 @@ #include "core/gimptoolinfo.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimphistogramview.h" #include "display/gimpdisplay.h" @@ -162,7 +163,7 @@ gimp_levels_tool_register (GimpToolRegisterCallback callback, _("Levels"), _("Adjust color levels"), N_("/Tools/Color Tools/_Levels..."), NULL, - NULL, "tools/levels.html", + NULL, GIMP_HELP_TOOL_LEVELS, GIMP_STOCK_TOOL_LEVELS, data); } @@ -188,7 +189,7 @@ gimp_levels_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpLevelsTool", + "GimpLevelsTool", &tool_info, 0); } @@ -315,7 +316,7 @@ gimp_levels_tool_initialize (GimpTool *tool, gtk_option_menu_set_history (GTK_OPTION_MENU (l_tool->channel_menu), l_tool->channel); - levels_update (l_tool, (LOW_INPUT | GAMMA | HIGH_INPUT | + levels_update (l_tool, (LOW_INPUT | GAMMA | HIGH_INPUT | LOW_OUTPUT | HIGH_OUTPUT | DRAW | INPUT_LEVELS | OUTPUT_LEVELS)); @@ -767,7 +768,7 @@ levels_update (GimpLevelsTool *l_tool, { gint i; gint sel_channel; - + if (l_tool->color) { sel_channel = l_tool->channel; @@ -830,7 +831,7 @@ levels_update (GimpLevelsTool *l_tool, case GIMP_HISTOGRAM_RED: case GIMP_HISTOGRAM_GREEN: - case GIMP_HISTOGRAM_BLUE: + case GIMP_HISTOGRAM_BLUE: for (i = 0; i < DA_WIDTH; i++) { buf[3 * i + 0] = l_tool->levels->input[GIMP_HISTOGRAM_RED][i]; @@ -989,7 +990,7 @@ levels_set_sensitive_callback (gpointer item_data, GimpLevelsTool *l_tool) { GimpHistogramChannel channel = GPOINTER_TO_INT (item_data); - + switch (channel) { case GIMP_HISTOGRAM_VALUE: @@ -1003,7 +1004,7 @@ levels_set_sensitive_callback (gpointer item_data, case GIMP_HISTOGRAM_ALPHA: return gimp_drawable_has_alpha (GIMP_IMAGE_MAP_TOOL (l_tool)->drawable); } - + return FALSE; } @@ -1116,7 +1117,7 @@ levels_input_picker_toggled (GtkWidget *widget, return; if (tool->active_picker) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tool->active_picker), + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tool->active_picker), FALSE); tool->active_picker = widget; @@ -1368,7 +1369,7 @@ gimp_levels_tool_color_picked (GimpColorTool *color_tool, if (value & ALL_CHANNELS && GIMP_IMAGE_TYPE_IS_RGB (sample_type)) { GimpHistogramChannel channel; - + /* first reset the value channel */ switch (value & 0xF) { @@ -1426,7 +1427,7 @@ levels_save_callback (GtkWidget *widget, { if (! l_tool->file_dialog) file_dialog_create (l_tool); - else if (GTK_WIDGET_VISIBLE (l_tool->file_dialog)) + else if (GTK_WIDGET_VISIBLE (l_tool->file_dialog)) return; l_tool->is_save = TRUE; @@ -1458,10 +1459,10 @@ file_dialog_create (GimpLevelsTool *l_tool) GTK_WINDOW (GIMP_IMAGE_MAP_TOOL (l_tool)->shell)); gtk_window_set_destroy_with_parent (GTK_WINDOW (file_dlg), TRUE); - g_signal_connect_swapped (file_dlg->ok_button, "clicked", + g_signal_connect_swapped (file_dlg->ok_button, "clicked", G_CALLBACK (file_dialog_ok_callback), l_tool); - g_signal_connect_swapped (file_dlg->cancel_button, "clicked", + g_signal_connect_swapped (file_dlg->cancel_button, "clicked", G_CALLBACK (gtk_widget_destroy), file_dlg); @@ -1517,7 +1518,7 @@ levels_read_from_file (GimpLevelsTool *l_tool, gdouble gamma[5]; gint i, fields; gchar buf[50], *nptr; - + if (! fgets (buf, 50, file)) return FALSE; diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c index 7f5e49946b..fa70496575 100644 --- a/app/tools/gimpmagnifytool.c +++ b/app/tools/gimpmagnifytool.c @@ -38,6 +38,7 @@ #include "display/gimpdisplayshell-scale.h" #include "widgets/gimpenummenu.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpwidgets-utils.h" #include "gimpmagnifyoptions.h" @@ -95,7 +96,7 @@ gimp_magnify_tool_register (GimpToolRegisterCallback callback, _("Magnify"), _("Zoom in & out"), N_("/Tools/M_agnify"), NULL, - NULL, "tools/magnify.html", + NULL, GIMP_HELP_TOOL_ZOOM, GIMP_STOCK_TOOL_ZOOM, data); } @@ -121,7 +122,7 @@ gimp_magnify_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, - "GimpMagnifyTool", + "GimpMagnifyTool", &tool_info, 0); } @@ -248,7 +249,7 @@ gimp_magnify_tool_button_release (GimpTool *tool, win_height = shell->disp_height; /* we need to compute the mouse movement in screen coordinates */ - if ((SCALEX (shell, w) < options->threshold) || + if ((SCALEX (shell, w) < options->threshold) || (SCALEY (shell, h) < options->threshold)) { gimp_display_shell_scale_zoom_fraction (options->zoom_type, diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 1b06941e3c..ce6f034d48 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -43,6 +43,7 @@ #include "core/gimptoolinfo.h" #include "widgets/gimpdialogfactory.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "display/gimpdisplay.h" @@ -128,7 +129,7 @@ gimp_measure_tool_register (GimpToolRegisterCallback callback, _("Measure"), _("Measure angles and lengths"), N_("/Tools/_Measure"), NULL, - NULL, "tools/measure.html", + NULL, GIMP_HELP_TOOL_MEASURE, GIMP_STOCK_TOOL_MEASURE, data); } @@ -154,7 +155,7 @@ gimp_measure_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, - "GimpMeasureTool", + "GimpMeasureTool", &tool_info, 0); } @@ -237,12 +238,12 @@ gimp_measure_tool_button_press (GimpTool *tool, shell = GIMP_DISPLAY_SHELL (gdisp->shell); - /* if we are changing displays, pop the statusbar of the old one */ + /* if we are changing displays, pop the statusbar of the old one */ if (gimp_tool_control_is_active (tool->control) && gdisp != tool->gdisp) { gimp_tool_pop_status (tool); } - + measure_tool->function = CREATING; if (gimp_tool_control_is_active (tool->control) && gdisp == tool->gdisp) @@ -268,7 +269,7 @@ gimp_measure_tool_button_press (GimpTool *tool, gboolean create_hguide; gboolean create_vguide; - create_hguide = ((state & GDK_CONTROL_MASK) && + create_hguide = ((state & GDK_CONTROL_MASK) && (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, @@ -326,7 +327,7 @@ gimp_measure_tool_button_press (GimpTool *tool, } /* if the function is still CREATING, we are outside the handles */ - if (measure_tool->function == CREATING) + if (measure_tool->function == CREATING) { if (measure_tool->num_points > 1 && (state & GDK_MOD1_MASK)) { @@ -337,7 +338,7 @@ gimp_measure_tool_button_press (GimpTool *tool, } } } - + if (measure_tool->function == CREATING) { if (gimp_tool_control_is_active (tool->control)) @@ -378,7 +379,7 @@ gimp_measure_tool_button_press (GimpTool *tool, const gchar *stock_id; stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool->tool_info)); - + measure_tool_info = info_dialog_new (NULL, tool->tool_info->blurb, GIMP_OBJECT (tool->tool_info)->name, @@ -565,16 +566,16 @@ gimp_measure_tool_motion (GimpTool *tool, if (shell->dot_for_dot) { distance = sqrt (SQR (ax - bx) + SQR (ay - by)); - + if (measure_tool->num_points != 3) bx = ax > 0 ? 1 : -1; - + measure_tool->angle1 = measure_get_angle (ax, ay, 1.0, 1.0); measure_tool->angle2 = measure_get_angle (bx, by, 1.0, 1.0); angle = fabs (measure_tool->angle1 - measure_tool->angle2); if (angle > 180.0) angle = fabs (360.0 - angle); - + g_snprintf (status_str, sizeof (status_str), "%.1f %s, %.2f %s", distance, _("pixels"), angle, _("degrees")); diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index f77dd9802b..3db49c59c1 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -39,6 +39,7 @@ #include "display/gimpdisplayshell-appearance.h" #include "display/gimpdisplayshell-transform.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpwidgets-utils.h" #include "gimpeditselectiontool.h" @@ -104,7 +105,7 @@ gimp_move_tool_register (GimpToolRegisterCallback callback, _("Move"), _("Move layers & selections"), N_("/Tools/Transform Tools/_Move"), "M", - NULL, "tools/move.html", + NULL, GIMP_HELP_TOOL_MOVE, GIMP_STOCK_TOOL_MOVE, data); } @@ -130,7 +131,7 @@ gimp_move_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, - "GimpMoveTool", + "GimpMoveTool", &tool_info, 0); } diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c index c49ea11c7b..ceb2eba830 100644 --- a/app/tools/gimppaintbrushtool.c +++ b/app/tools/gimppaintbrushtool.c @@ -27,6 +27,8 @@ #include "paint/gimppaintbrush.h" #include "paint/gimppaintoptions.h" +#include "widgets/gimphelp-ids.h" + #include "gimppaintbrushtool.h" #include "gimppaintoptions-gui.h" #include "gimptoolcontrol.h" @@ -56,7 +58,7 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback callback, _("Paintbrush"), _("Paint fuzzy brush strokes"), N_("/Tools/Paint Tools/_Paintbrush"), "P", - NULL, "tools/paintbrush.html", + NULL, GIMP_HELP_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH, data); } diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c index 57b65da7cb..fa64c5f420 100644 --- a/app/tools/gimppenciltool.c +++ b/app/tools/gimppenciltool.c @@ -27,6 +27,8 @@ #include "paint/gimppencil.h" #include "paint/gimppenciloptions.h" +#include "widgets/gimphelp-ids.h" + #include "gimppenciltool.h" #include "gimppaintoptions-gui.h" #include "gimptoolcontrol.h" @@ -55,7 +57,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback callback, _("Pencil"), _("Paint hard edged pixels"), N_("/Tools/Paint Tools/Pe_ncil"), "N", - NULL, "tools/pencil.html", + NULL, GIMP_HELP_TOOL_PENCIL, GIMP_STOCK_TOOL_PENCIL, data); } diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index af59fdac41..50b9ae32bd 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -25,18 +25,19 @@ #include "tools-types.h" -#ifdef __GNUC__ -#warning FIXME #include "gui/gui-types.h" -#endif -#include "gui/gui-types.h" - #include "core/gimpimage.h" #include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform-utils.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" +#ifdef __GNUC__ +#warning FIXME #include "gui/gui-types.h" +#endif +#include "gui/gui-types.h" #include "gui/info-dialog.h" #include "gimpperspectivetool.h" @@ -70,7 +71,7 @@ static GimpTransformToolClass *parent_class = NULL; /* public functions */ -void +void gimp_perspective_tool_register (GimpToolRegisterCallback callback, gpointer data) { @@ -82,7 +83,7 @@ gimp_perspective_tool_register (GimpToolRegisterCallback callback, _("Perspective"), _("Change perspective of the layer or selection"), N_("/Tools/Transform Tools/_Perspective"), "P", - NULL, "tools/perspective.html", + NULL, GIMP_HELP_TOOL_PERSPECTIVE, GIMP_STOCK_TOOL_PERSPECTIVE, data); } @@ -108,7 +109,7 @@ gimp_perspective_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, - "GimpPerspectiveTool", + "GimpPerspectiveTool", &tool_info, 0); } @@ -243,7 +244,7 @@ static void perspective_info_update (GimpTransformTool *tr_tool) { gint i; - + for (i = 0; i < 3; i++) { gchar *p = matrix_row_buf[i]; diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c index 008d2009b5..8ce39ff5c0 100644 --- a/app/tools/gimpposterizetool.c +++ b/app/tools/gimpposterizetool.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "tools-types.h" - + #include "base/gimplut.h" #include "base/lut-funcs.h" @@ -31,6 +31,8 @@ #include "core/gimpimage.h" #include "core/gimpimagemap.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "gimpposterizetool.h" @@ -75,7 +77,7 @@ gimp_posterize_tool_register (GimpToolRegisterCallback callback, _("Posterize"), _("Reduce image to a fixed number of colors"), N_("/Tools/Color Tools/_Posterize..."), NULL, - NULL, "tools/posterize.html", + NULL, GIMP_HELP_TOOL_POSTERIZE, GIMP_STOCK_TOOL_POSTERIZE, data); } @@ -101,7 +103,7 @@ gimp_posterize_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpPosterizeTool", + "GimpPosterizeTool", &tool_info, 0); } diff --git a/app/tools/gimprectselecttool.c b/app/tools/gimprectselecttool.c index d31fe7a241..e3ab8748be 100644 --- a/app/tools/gimprectselecttool.c +++ b/app/tools/gimprectselecttool.c @@ -37,6 +37,8 @@ #include "core/gimpmarshal.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" @@ -95,7 +97,7 @@ gimp_rect_select_tool_register (GimpToolRegisterCallback callback, _("Rect Select"), _("Select rectangular regions"), N_("/Tools/Selection Tools/_Rect Select"), "R", - NULL, "tools/rect_select.html", + NULL, GIMP_HELP_TOOL_RECT_SELECT, GIMP_STOCK_TOOL_RECT_SELECT, data); } @@ -121,7 +123,7 @@ gimp_rect_select_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, - "GimpRectSelectTool", + "GimpRectSelectTool", &tool_info, 0); } @@ -389,7 +391,7 @@ gimp_rect_select_tool_motion (GimpTool *tool, if ((th < 0 && h > 0) || (th > 0 && h < 0)) h = -h; } - else + else { h = th; w = (gint) (th / ratio); @@ -584,7 +586,7 @@ gimp_rect_select_tool_rect_select (GimpRectSelectTool *rect_tool, GIMP_RECT_SELECT_TOOL_GET_CLASS (rect_tool)->rect_select (rect_tool, x, y, w, h); } - + static void gimp_rect_select_tool_update_options (GimpRectSelectTool *rect_sel, GimpDisplay *gdisp) @@ -606,7 +608,7 @@ gimp_rect_select_tool_update_options (GimpRectSelectTool *rect_sel, { GimpImage *gimage; gdouble unit_factor; - + gimage = gdisp->gimage; unit = gimage->unit; diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index aebaab7362..1bece76fa4 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -39,6 +39,8 @@ #include "core/gimplayer-floating-sel.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell-cursor.h" @@ -98,7 +100,7 @@ gimp_fuzzy_select_tool_register (GimpToolRegisterCallback callback, _("Fuzzy Select"), _("Select contiguous regions"), N_("/Tools/Selection Tools/Fu_zzy Select"), "Z", - NULL, "tools/fuzzy_select.html", + NULL, GIMP_HELP_TOOL_FUZZY_SELECT, GIMP_STOCK_TOOL_FUZZY_SELECT, data); } diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index 47ee41c6d0..ec4bbdbdd4 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -25,21 +25,20 @@ #include "tools-types.h" -#ifdef __GNUC__ -#warning FIXME #include "gui/gui-types.h" -#endif -#include "gui/gui-types.h" - #include "core/gimpimage.h" #include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform-utils.h" #include "core/gimptoolinfo.h" -#include "widgets/gimpviewabledialog.h" +#include "widgets/gimphelp-ids.h" #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" +#ifdef __GNUC__ +#warning FIXME #include "gui/gui-types.h" +#endif +#include "gui/gui-types.h" #include "gui/info-dialog.h" #include "gimprotatetool.h" @@ -92,7 +91,7 @@ static GimpTransformToolClass *parent_class = NULL; /* public functions */ -void +void gimp_rotate_tool_register (GimpToolRegisterCallback callback, gpointer data) { @@ -104,7 +103,7 @@ gimp_rotate_tool_register (GimpToolRegisterCallback callback, _("Rotate"), _("Rotate the layer or selection"), N_("/Tools/Transform Tools/_Rotate"), "R", - NULL, "tools/rotate.html", + NULL, GIMP_HELP_TOOL_ROTATE, GIMP_STOCK_TOOL_ROTATE, data); } @@ -130,7 +129,7 @@ gimp_rotate_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, - "GimpRotateTool", + "GimpRotateTool", &tool_info, 0); } @@ -222,7 +221,7 @@ gimp_rotate_tool_prepare (GimpTransformTool *tr_tool, center_vals[0] = tr_tool->cx; center_vals[1] = tr_tool->cy; - g_signal_handlers_block_by_func (sizeentry, + g_signal_handlers_block_by_func (sizeentry, rotate_center_changed, tr_tool); @@ -254,7 +253,7 @@ gimp_rotate_tool_prepare (GimpTransformTool *tr_tool, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, center_vals[1]); - g_signal_handlers_unblock_by_func (sizeentry, + g_signal_handlers_unblock_by_func (sizeentry, rotate_center_changed, tr_tool); diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index d8f9bd378d..08cd0d7b37 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -26,19 +26,20 @@ #include "tools-types.h" -#ifdef __GNUC__ -#warning FIXME #include "gui/gui-types.h" -#endif -#include "gui/gui-types.h" - #include "core/gimpimage.h" #include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform-utils.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" +#ifdef __GNUC__ +#warning FIXME #include "gui/gui-types.h" +#endif +#include "gui/gui-types.h" #include "gui/info-dialog.h" #include "gimpscaletool.h" @@ -97,7 +98,7 @@ gimp_scale_tool_register (GimpToolRegisterCallback callback, _("Scale"), _("Scale the layer or selection"), N_("/Tools/Transform Tools/_Scale"), "T", - NULL, "tools/transform.html", + NULL, GIMP_HELP_TOOL_SCALE, GIMP_STOCK_TOOL_SCALE, data); } @@ -123,7 +124,7 @@ gimp_scale_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, - "GimpScaleTool", + "GimpScaleTool", &tool_info, 0); } @@ -195,7 +196,7 @@ gimp_scale_tool_dialog (GimpTransformTool *tr_tool) gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry), GTK_SPIN_BUTTON (spinbutton), NULL); - info_dialog_add_label (tr_tool->info_dialog, + info_dialog_add_label (tr_tool->info_dialog, _("Scale Ratio X:"), x_ratio_buf); info_dialog_add_label (tr_tool->info_dialog, @@ -215,10 +216,10 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool, size_vals[0] = tr_tool->x2 - tr_tool->x1; size_vals[1] = tr_tool->y2 - tr_tool->y1; - g_signal_handlers_block_by_func (sizeentry, + g_signal_handlers_block_by_func (sizeentry, gimp_scale_tool_size_changed, tr_tool); - g_signal_handlers_block_by_func (sizeentry, + g_signal_handlers_block_by_func (sizeentry, gimp_scale_tool_unit_changed, tr_tool); @@ -250,10 +251,10 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, size_vals[1]); - g_signal_handlers_unblock_by_func (sizeentry, + g_signal_handlers_unblock_by_func (sizeentry, gimp_scale_tool_size_changed, tr_tool); - g_signal_handlers_unblock_by_func (sizeentry, + g_signal_handlers_unblock_by_func (sizeentry, gimp_scale_tool_unit_changed, tr_tool); @@ -366,7 +367,7 @@ gimp_scale_tool_motion (GimpTransformTool *tr_tool, } /* if both the control key & mod1 keys are down, - * keep the aspect ratio intact + * keep the aspect ratio intact */ if (options->constrain_1 && options->constrain_2) { diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 7d64e38bfd..21de987c97 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -27,18 +27,19 @@ #include "tools-types.h" -#ifdef __GNUC__ -#warning FIXME #include "gui/gui-types.h" -#endif -#include "gui/gui-types.h" - #include "core/gimpimage.h" #include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform-utils.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" +#ifdef __GNUC__ +#warning FIXME #include "gui/gui-types.h" +#endif +#include "gui/gui-types.h" #include "gui/info-dialog.h" #include "gimpsheartool.h" @@ -87,7 +88,7 @@ static GimpTransformToolClass *parent_class = NULL; /* Public functions */ -void +void gimp_shear_tool_register (GimpToolRegisterCallback callback, gpointer data) { @@ -99,7 +100,7 @@ gimp_shear_tool_register (GimpToolRegisterCallback callback, _("Shear"), _("Shear the layer or selection"), N_("/Tools/Transform Tools/S_hear"), "S", - NULL, "tools/shear.html", + NULL, GIMP_HELP_TOOL_SHEAR, GIMP_STOCK_TOOL_SHEAR, data); } @@ -125,7 +126,7 @@ gimp_shear_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, - "GimpShearTool", + "GimpShearTool", &tool_info, 0); } diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c index a966e6e2b0..e7cda37981 100644 --- a/app/tools/gimpsmudgetool.c +++ b/app/tools/gimpsmudgetool.c @@ -29,6 +29,7 @@ #include "paint/gimpsmudge.h" #include "paint/gimpsmudgeoptions.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "gimpsmudgetool.h" @@ -61,7 +62,7 @@ gimp_smudge_tool_register (GimpToolRegisterCallback callback, _("Smudge"), _("Smudge image"), N_("/Tools/Paint Tools/_Smudge"), "S", - NULL, "tools/smudge.html", + NULL, GIMP_HELP_TOOL_SMUDGE, GIMP_STOCK_TOOL_SMUDGE, data); } diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c index e65baedbde..915d056b0d 100644 --- a/app/tools/gimpsourcetool.c +++ b/app/tools/gimpsourcetool.c @@ -32,10 +32,11 @@ #include "paint/gimpclone.h" #include "paint/gimpcloneoptions.h" -#include "display/gimpdisplay.h" - +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" +#include "display/gimpdisplay.h" + #include "gimpclonetool.h" #include "gimppaintoptions-gui.h" #include "gimptoolcontrol.h" @@ -98,7 +99,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback callback, _("Clone"), _("Paint using Patterns or Image Regions"), N_("/Tools/Paint Tools/_Clone"), "C", - NULL, "tools/clone.html", + NULL, GIMP_HELP_TOOL_CLONE, GIMP_STOCK_TOOL_CLONE, data); } diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index d0b5d07be5..4a1f7ca0ff 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -45,6 +45,7 @@ #include "widgets/gimpdialogfactory.h" #include "widgets/gimpfontselection.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" @@ -114,7 +115,7 @@ gimp_text_tool_register (GimpToolRegisterCallback callback, _("Text"), _("Add text to the image"), N_("/Tools/Te_xt"), "T", - NULL, "tools/text.html", + NULL, GIMP_HELP_TOOL_TEXT, GIMP_STOCK_TOOL_TEXT, data); } diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c index 7e9669fcc0..d4bd8da839 100644 --- a/app/tools/gimpthresholdtool.c +++ b/app/tools/gimpthresholdtool.c @@ -36,6 +36,7 @@ #include "core/gimpimagemap.h" #include "core/gimptoolinfo.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimphistogrambox.h" #include "widgets/gimphistogramview.h" @@ -88,7 +89,7 @@ gimp_threshold_tool_register (GimpToolRegisterCallback callback, _("Threshold"), _("Reduce image to two colors using a threshold"), N_("/Tools/Color Tools/_Threshold..."), NULL, - NULL, "tools/threshold.html", + NULL, GIMP_HELP_TOOL_THRESHOLD, GIMP_STOCK_TOOL_THRESHOLD, data); } @@ -114,7 +115,7 @@ gimp_threshold_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, - "GimpThresholdTool", + "GimpThresholdTool", &tool_info, 0); } diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c index fbe967729e..2b886b5e68 100644 --- a/app/tools/gimpvectortool.c +++ b/app/tools/gimpvectortool.c @@ -41,6 +41,8 @@ #include "vectors/gimpvectors.h" #include "vectors/gimpbezierstroke.h" +#include "widgets/gimphelp-ids.h" + #include "display/gimpdisplay.h" #include "display/gimpdisplay-foreach.h" @@ -125,7 +127,7 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback, _("Paths"), _("Create and edit paths"), N_("/Tools/_Paths"), NULL, - NULL, "tools/paths.html", + NULL, GIMP_HELP_TOOL_PATH, GIMP_STOCK_TOOL_PATH, data); } @@ -151,7 +153,7 @@ gimp_vector_tool_get_type (void) }; tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, - "GimpVectorTool", + "GimpVectorTool", &tool_info, 0); } @@ -189,7 +191,7 @@ gimp_vector_tool_init (GimpVectorTool *vector_tool) tool = GIMP_TOOL (vector_tool); gimp_tool_control_set_scroll_lock (tool->control, TRUE); - + vector_tool->function = VECTORS_CREATE_VECTOR; vector_tool->last_x = 0; vector_tool->last_y = 0; @@ -253,19 +255,19 @@ gimp_vector_tool_button_press (GimpTool *tool, /* when pressing mouse down * - * Anchor: (NONE) -> Regular Movement + * Anchor: (NONE) -> Regular Movement * (SHFT) -> multiple selection * (CTRL) -> Drag out control point * (CTRL+SHFT) -> Convert to corner * (ALT) -> close this stroke (really should be able to connect * two strokes) - * + * * Handle: (NONE) -> Regular Movement * (SHFT) -> (Handle) Move opposite handle symmetrically * (CTRL+SHFT) -> move handle to its anchor */ - /* if we are changing displays, pop the statusbar of the old one */ + /* if we are changing displays, pop the statusbar of the old one */ if (gdisp != tool->gdisp) { /* gimp_tool_pop_status (tool); */ @@ -336,7 +338,7 @@ gimp_vector_tool_button_press (GimpTool *tool, vector_tool->cur_anchor = NULL; vector_tool->function = VECTORS_FINISHED; } - + break; case VECTORS_DELETE_SEGMENT: @@ -420,7 +422,7 @@ gimp_vector_tool_button_press (GimpTool *tool, { gimp_vectors_anchor_select (vector_tool->vectors, stroke, anchor, TRUE); - + /* if the selected anchor changed, the visible control * points might have changed too */ if (vector_tool->function == VECTORS_MOVE_HANDLE) @@ -433,9 +435,9 @@ gimp_vector_tool_button_press (GimpTool *tool, } vector_tool->cur_stroke = stroke; vector_tool->cur_anchor = anchor; - + break; /* here it is... :-) */ - + case VECTORS_CONVERT_EDGE: if (gimp_vector_tool_on_handle (tool, coords, GIMP_ANCHOR_ANCHOR, gdisp, @@ -463,7 +465,7 @@ gimp_vector_tool_button_press (GimpTool *tool, vector_tool->function = VECTORS_FINISHED; } } - + break; default: @@ -668,7 +670,7 @@ gimp_vector_tool_on_handle (GimpTool *tool, { if (ret_anchor) *ret_anchor = anchor; - + /* *ret_stroke already set correctly. */ return TRUE; } @@ -804,7 +806,7 @@ gimp_vector_tool_oper_update (GimpTool *tool, } } } - else + else { vector_tool->function = VECTORS_MOVE_ANCHOR; } @@ -979,7 +981,7 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool) /* the lines to the control handles */ coords = gimp_stroke_get_draw_lines (cur_stroke); - + if (coords->len % 2 == 0) { gint i; @@ -1089,7 +1091,7 @@ gimp_vector_tool_set_vectors (GimpVectorTool *vector_tool, g_object_ref (vectors); - g_signal_connect_object (vectors, "removed", + g_signal_connect_object (vectors, "removed", G_CALLBACK (gimp_vector_tool_clear_vectors), vector_tool, G_CONNECT_SWAPPED); diff --git a/app/widgets/gimperrorconsole.c b/app/widgets/gimperrorconsole.c index 95f3fe3f73..98671e9e50 100644 --- a/app/widgets/gimperrorconsole.c +++ b/app/widgets/gimperrorconsole.c @@ -56,6 +56,7 @@ #include "core/gimp.h" #include "gimperrorconsole.h" +#include "gimphelp-ids.h" #include "gimpitemfactory.h" #include "gimpmenufactory.h" #include "gimpwidgets-utils.h" @@ -368,10 +369,8 @@ gimp_error_console_save_ext_clicked (GtkWidget *button, G_CALLBACK (gimp_error_console_save_ok_clicked), console); - /* Connect the "F1" help key */ - gimp_help_connect (GTK_WIDGET (filesel), - gimp_standard_help_func, - "dialogs/error_console.html"); + gimp_help_connect (GTK_WIDGET (filesel), gimp_standard_help_func, + GIMP_HELP_ERROR_DIALOG); gtk_widget_show (GTK_WIDGET (filesel)); } diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index e0522b7395..d89890f0c1 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -23,235 +23,294 @@ #define __GIMP_HELP_IDS_H__ -#define GIMP_HELP_FILE_NEW "file/dialogs/file_new.html" -#define GIMP_HELP_FILE_NEW_CONFIRM "file/dialogs/file_new.html#confirm_dialog" -#define GIMP_HELP_FILE_OPEN "file/dialogs/file_open.html" -#define GIMP_HELP_FILE_SAVE "file/dialogs/file_save.html" -#define GIMP_HELP_FILE_SAVE_AS "file/dialogs/file_save.html" -#define GIMP_HELP_FILE_SAVE_A_COPY "file/dialogs/file_save.html" -#define GIMP_HELP_FILE_SAVE_AS_TEMPLATE "file/dialogs/file_save.html" -#define GIMP_HELP_FILE_SAVE_OVERWRITE "file/dialogs/file_exists.html" -#define GIMP_HELP_FILE_REVERT "file/revert.html" -#define GIMP_HELP_FILE_CLOSE "file/close.html" -#define GIMP_HELP_FILE_QUIT "file/quit.html" +#define GIMP_HELP_FILE_NEW "dialogs/file_new.html" +#define GIMP_HELP_FILE_NEW_CONFIRM "dialogs/file_new.html#confirm_dialog" +#define GIMP_HELP_FILE_OPEN "dialogs/file_open.html" +#define GIMP_HELP_FILE_OPEN_BY_EXTENSION "file/open_by_extension.html" +#define GIMP_HELP_FILE_OPEN_RECENT "file/last_opened.html" +#define GIMP_HELP_FILE_SAVE "dialogs/file_save.html" +#define GIMP_HELP_FILE_SAVE_AS "dialogs/file_save.html" +#define GIMP_HELP_FILE_SAVE_A_COPY "dialogs/file_save.html" +#define GIMP_HELP_FILE_SAVE_AS_TEMPLATE "dialogs/file_save.html" +#define GIMP_HELP_FILE_SAVE_BY_EXTENSION "file/save_by_extension.html" +#define GIMP_HELP_FILE_SAVE_OVERWRITE "dialogs/file_exists.html" +#define GIMP_HELP_FILE_REVERT "file/revert.html" +#define GIMP_HELP_FILE_CLOSE "file/close.html" +#define GIMP_HELP_FILE_CLOSE_CONFIRM "dialogs/really_close.html" +#define GIMP_HELP_FILE_QUIT "file/quit.html" +#define GIMP_HELP_FILE_QUIT_CONFIRM "dialogs/really_quit.html" -#define GIMP_HELP_EDIT_UNDO "edit/undo.html" -#define GIMP_HELP_EDIT_REDO "edit/redo.html" -#define GIMP_HELP_EDIT_CUT "edit/cut.html" -#define GIMP_HELP_EDIT_COPY "edit/copy.html" -#define GIMP_HELP_EDIT_PASTE "edit/paste.html" -#define GIMP_HELP_EDIT_PASTE_INTO "edit/paste_into.html" -#define GIMP_HELP_EDIT_PASTE_AS_NEW "edit/paste_as_new.html" -#define GIMP_HELP_EDIT_CLEAR "edit/clear.html" -#define GIMP_HELP_EDIT_FILL_FG "edit/fill.html" -#define GIMP_HELP_EDIT_FILL_BG "edit/fill.html" -#define GIMP_HELP_EDIT_FILL_PATTERN "edit/fill.html" -#define GIMP_HELP_EDIT_STROKE_SELECTION "edit/stroke.html" -#define GIMP_HELP_EDIT_STROKE_PATH "edit/stroke.html" +#define GIMP_HELP_EDIT_UNDO "edit/undo.html" +#define GIMP_HELP_EDIT_REDO "edit/redo.html" +#define GIMP_HELP_EDIT_CUT "edit/cut.html" +#define GIMP_HELP_EDIT_COPY "edit/copy.html" +#define GIMP_HELP_EDIT_PASTE "edit/paste.html" +#define GIMP_HELP_EDIT_PASTE_INTO "edit/paste_into.html" +#define GIMP_HELP_EDIT_PASTE_AS_NEW "edit/paste_as_new.html" +#define GIMP_HELP_EDIT_CLEAR "edit/clear.html" +#define GIMP_HELP_EDIT_FILL_FG "edit/fill.html" +#define GIMP_HELP_EDIT_FILL_BG "edit/fill.html" +#define GIMP_HELP_EDIT_FILL_PATTERN "edit/fill.html" +#define GIMP_HELP_EDIT_STROKE_SELECTION "edit/stroke.html" +#define GIMP_HELP_EDIT_STROKE_PATH "edit/stroke.html" -#define GIMP_HELP_SELECT_DIALOG "dialogs/selection_editor.html" -#define GIMP_HELP_SELECT_ALL "select/all.html" -#define GIMP_HELP_SELECT_NONE "select/none.html" -#define GIMP_HELP_SELECT_INVERT "select/invert.html" -#define GIMP_HELP_SELECT_FLOAT "select/float.html" -#define GIMP_HELP_SELECT_FEATHER "select/dialogs/feather_selection.html" -#define GIMP_HELP_SELECT_SHARPEN "select/sharpen.html" -#define GIMP_HELP_SELECT_SHRINK "select/dialogs/shrink_selection.html" -#define GIMP_HELP_SELECT_GROW "select/dialogs/grow_selection.html" -#define GIMP_HELP_SELECT_BORDER "select/dialogs/border_selection.html" -#define GIMP_HELP_SELECT_QUICKMASK "select/quickmask.html" -#define GIMP_HELP_SELECT_SAVE_TO_CHANNEL "select/save_to_channel.html" +#define GIMP_HELP_SELECT_DIALOG "dialogs/selection_editor.html" +#define GIMP_HELP_SELECT_ALL "select/all.html" +#define GIMP_HELP_SELECT_NONE "select/none.html" +#define GIMP_HELP_SELECT_INVERT "select/invert.html" +#define GIMP_HELP_SELECT_FLOAT "select/float.html" +#define GIMP_HELP_SELECT_FEATHER "dialogs/feather_selection.html" +#define GIMP_HELP_SELECT_SHARPEN "select/sharpen.html" +#define GIMP_HELP_SELECT_SHRINK "dialogs/shrink_selection.html" +#define GIMP_HELP_SELECT_GROW "dialogs/grow_selection.html" +#define GIMP_HELP_SELECT_BORDER "dialogs/border_selection.html" +#define GIMP_HELP_SELECT_SAVE_TO_CHANNEL "select/save_to_channel.html" -#define GIMP_HELP_VIEW_NEW "view/new.html" -#define GIMP_HELP_VIEW_DOT_FOR_DOT "view/dot_for_dot.html" -#define GIMP_HELP_VIEW_ZOOM "view/zoom.html" -#define GIMP_HELP_VIEW_ZOOM_TO_FIT "view/zoom.html" -#define GIMP_HELP_VIEW_SHOW_SELECTION "view/toggle_selection.html" -#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY "view/toggle_selection.html" -#define GIMP_HELP_VIEW_SHOW_GUIDES "view/toggle_guides.html" -#define GIMP_HELP_VIEW_SNAP_TO_GUIDES "view/gnap_to_guides.html" -#define GIMP_HELP_VIEW_SHOW_GRID "view/toggle_grid.html" -#define GIMP_HELP_VIEW_SNAP_TO_GRID "view/snap_to_grid.html" -#define GIMP_HELP_VIEW_SHOW_MENUBAR "view/toggle_menubar.html" -#define GIMP_HELP_VIEW_SHOW_RULERS "view/toggle_rulers.html" -#define GIMP_HELP_VIEW_SHOW_SCROLLBARS "view/toggle_scrollbars.html" -#define GIMP_HELP_VIEW_SHOW_STATUSBAR "view/toggle_statusbar.html" -#define GIMP_HELP_VIEW_SHRINK_WRAP "view/shrink_wrap.html" -#define GIMP_HELP_VIEW_FULLSCREEN "view/fullscreen.html" +#define GIMP_HELP_VIEW_NEW "view/new.html" +#define GIMP_HELP_VIEW_DOT_FOR_DOT "view/dot_for_dot.html" +#define GIMP_HELP_VIEW_ZOOM "view/zoom.html" +#define GIMP_HELP_VIEW_ZOOM_TO_FIT "view/zoom.html" +#define GIMP_HELP_VIEW_SHOW_SELECTION "view/toggle_selection.html" +#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY "view/toggle_selection.html" +#define GIMP_HELP_VIEW_SHOW_GUIDES "view/toggle_guides.html" +#define GIMP_HELP_VIEW_SNAP_TO_GUIDES "view/gnap_to_guides.html" +#define GIMP_HELP_VIEW_SHOW_GRID "view/toggle_grid.html" +#define GIMP_HELP_VIEW_SNAP_TO_GRID "view/snap_to_grid.html" +#define GIMP_HELP_VIEW_SHOW_MENUBAR "view/toggle_menubar.html" +#define GIMP_HELP_VIEW_SHOW_RULERS "view/toggle_rulers.html" +#define GIMP_HELP_VIEW_SHOW_SCROLLBARS "view/toggle_scrollbars.html" +#define GIMP_HELP_VIEW_SHOW_STATUSBAR "view/toggle_statusbar.html" +#define GIMP_HELP_VIEW_SHRINK_WRAP "view/shrink_wrap.html" +#define GIMP_HELP_VIEW_FULLSCREEN "view/fullscreen.html" -#define GIMP_HELP_IMAGE_DIALOG "dialogs/image_dialog.html" -#define GIMP_HELP_IMAGE_CONVERT_RGB "image/mode/convert_to_rgb.html" -#define GIMP_HELP_IMAGE_CONVERT_GRAYSCALE "image/mode/convert_to_grayscale.html" -#define GIMP_HELP_IMAGE_CONVERT_INDEXED "image/mode/convert_to_indexed.html" -#define GIMP_HELP_IMAGE_FLIP_HORIZONTAL "image/dialogs/flip_image.html" -#define GIMP_HELP_IMAGE_FLIP_VERTICAL "image/dialogs/flip_image.html" -#define GIMP_HELP_IMAGE_ROTATE_90 "image/dialogs/rotate_image.html" -#define GIMP_HELP_IMAGE_ROTATE_180 "image/dialogs/rotate_image.html" -#define GIMP_HELP_IMAGE_ROTATE_270 "image/dialogs/rotate_image.html" -#define GIMP_HELP_IMAGE_RESIZE "image/dialogs/set_canvas_size.html" -#define GIMP_HELP_IMAGE_SCALE "image/dialogs/scale_image.html" -#define GIMP_HELP_IMAGE_CROP "image/dialogs/crop_image.html" -#define GIMP_HELP_IMAGE_DUPLICATE "image/duplicate.html" -#define GIMP_HELP_IMAGE_MERGE_LAYERS "layers/dialogs/merge_visible_layers.html" -#define GIMP_HELP_IMAGE_FLATTEN "layers/flatten_image.html" -#define GIMP_HELP_IMAGE_GRID "image/dialogs/configure_grid.html" +#define GIMP_HELP_IMAGE_DIALOG "dialogs/image_dialog.html" +#define GIMP_HELP_IMAGE_CONVERT_RGB "image/mode/convert_to_rgb.html" +#define GIMP_HELP_IMAGE_CONVERT_GRAYSCALE "image/mode/convert_to_grayscale.html" +#define GIMP_HELP_IMAGE_CONVERT_INDEXED "image/mode/convert_to_indexed.html" +#define GIMP_HELP_IMAGE_FLIP_HORIZONTAL "dialogs/flip_image.html" +#define GIMP_HELP_IMAGE_FLIP_VERTICAL "dialogs/flip_image.html" +#define GIMP_HELP_IMAGE_ROTATE_90 "dialogs/rotate_image.html" +#define GIMP_HELP_IMAGE_ROTATE_180 "dialogs/rotate_image.html" +#define GIMP_HELP_IMAGE_ROTATE_270 "dialogs/rotate_image.html" +#define GIMP_HELP_IMAGE_RESIZE "dialogs/set_canvas_size.html" +#define GIMP_HELP_IMAGE_SCALE "dialogs/scale_image.html" +#define GIMP_HELP_IMAGE_SCALE_WARNING "dialogs/scale_image.html" +#define GIMP_HELP_IMAGE_CROP "dialogs/crop_image.html" +#define GIMP_HELP_IMAGE_DUPLICATE "image/duplicate.html" +#define GIMP_HELP_IMAGE_MERGE_LAYERS "/dialogs/merge_visible_layers.html" +#define GIMP_HELP_IMAGE_FLATTEN "layers/flatten_image.html" +#define GIMP_HELP_IMAGE_GRID "dialogs/configure_grid.html" -#define GIMP_HELP_LAYER_DIALOG "layers/dialogs/layers_dialog.html" -#define GIMP_HELP_LAYER_NEW "layers/dialogs/new_layer.html" -#define GIMP_HELP_LAYER_DUPLICATE "layers/duplicate_layer.html" -#define GIMP_HELP_LAYER_ANCHOR "layers/anchor_layer.html" -#define GIMP_HELP_LAYER_MERGE_DOWN "layers/merge_down.html" -#define GIMP_HELP_LAYER_DELETE "layers/delete_layer.html" -#define GIMP_HELP_LAYER_PREVIOUS "layers/stack/stack.html#previous_layer" -#define GIMP_HELP_LAYER_NEXT "layers/stack/stack.html#next_layer" -#define GIMP_HELP_LAYER_TOP "layers/stack/stack.html#previous_layer" -#define GIMP_HELP_LAYER_BOTTOM "layers/stack/stack.html#next_layer" -#define GIMP_HELP_LAYER_RAISE "layers/stack/stack.html#raise_layer" -#define GIMP_HELP_LAYER_LOWER "layers/stack/stack.html#lower_layer" -#define GIMP_HELP_LAYER_RAISE_TO_TOP "layers/stack/stack.html#layer_to_top" -#define GIMP_HELP_LAYER_LOWER_TO_BOTTOM "layers/stack/stack.html#layer_to_bottom" -#define GIMP_HELP_LAYER_DESATURATE "layers/colors/desaturate.html" -#define GIMP_HELP_LAYER_INVERT "layers/colors/invert.html" -#define GIMP_HELP_LAYER_EQUALIZE "layers/colors/auto/equalize.html" -#define GIMP_HELP_LAYER_MASK_ADD "layers/dialogs/add_layer_mask.html" -#define GIMP_HELP_LAYER_MASK_APPLY "layers/apply_mask.html" -#define GIMP_HELP_LAYER_MASK_DELETE "layers/delete_mask.html" -#define GIMP_HELP_LAYER_MASK_SEL_REPLACE "layers/mask_to_selection.html" -#define GIMP_HELP_LAYER_MASK_SEL_ADD "layers/mask_to_selection.html#add" -#define GIMP_HELP_LAYER_MASK_SEL_SUB "layers/mask_to_selection.html#subtract" -#define GIMP_HELP_LAYER_MASK_SEL_INTERSECT "layers/mask_to_selection.html#intersect" -#define GIMP_HELP_LAYER_ALPHA_ADD "layers/add_alpha_channel.html" -#define GIMP_HELP_LAYER_ALPHA_SEL_REPLACE "layers/alpha_to_selection.html" -#define GIMP_HELP_LAYER_ALPHA_SEL_ADD "layers/alpha_to_selection.html#add" -#define GIMP_HELP_LAYER_ALPHA_SEL_SUB "layers/alpha_to_selection.html#subtract" -#define GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT "layers/alpha_to_selection.html#intersect" -#define GIMP_HELP_LAYER_FLIP_HORIZONTAL "layers/flip_layer.html" -#define GIMP_HELP_LAYER_FLIP_VERTICAL "layers/flip_layer.html" -#define GIMP_HELP_LAYER_ROTATE_90 "layers/rotate_layer.html" -#define GIMP_HELP_LAYER_ROTATE_180 "layers/rotate_layer.html" -#define GIMP_HELP_LAYER_ROTATE_270 "layers/rotate_layer.html" -#define GIMP_HELP_LAYER_OFFSET "layers/dialogs/offset.html" -#define GIMP_HELP_LAYER_RESIZE "layers/dialogs/layer_boundary_size.html" -#define GIMP_HELP_LAYER_RESIZE_TO_IMAGE "layers/layer_to_image_size.html" -#define GIMP_HELP_LAYER_SCALE "layers/dialogs/scale_layer.html" -#define GIMP_HELP_LAYER_CROP "layers/dialogs/crop_layer.html" -#define GIMP_HELP_LAYER_EDIT "layers/dialogs/edit_layer_attributes.html" +#define GIMP_HELP_LAYER_DIALOG "/dialogs/layers_dialog.html" +#define GIMP_HELP_LAYER_NEW "/dialogs/new_layer.html" +#define GIMP_HELP_LAYER_DUPLICATE "layers/duplicate_layer.html" +#define GIMP_HELP_LAYER_ANCHOR "layers/anchor_layer.html" +#define GIMP_HELP_LAYER_MERGE_DOWN "layers/merge_down.html" +#define GIMP_HELP_LAYER_DELETE "layers/delete_layer.html" +#define GIMP_HELP_LAYER_PREVIOUS "layers/stack/stack.html#previous_layer" +#define GIMP_HELP_LAYER_NEXT "layers/stack/stack.html#next_layer" +#define GIMP_HELP_LAYER_TOP "layers/stack/stack.html#previous_layer" +#define GIMP_HELP_LAYER_BOTTOM "layers/stack/stack.html#next_layer" +#define GIMP_HELP_LAYER_RAISE "layers/stack/stack.html#raise_layer" +#define GIMP_HELP_LAYER_LOWER "layers/stack/stack.html#lower_layer" +#define GIMP_HELP_LAYER_RAISE_TO_TOP "layers/stack/stack.html#layer_to_top" +#define GIMP_HELP_LAYER_LOWER_TO_BOTTOM "layers/stack/stack.html#layer_to_bottom" +#define GIMP_HELP_LAYER_DESATURATE "layers/colors/desaturate.html" +#define GIMP_HELP_LAYER_INVERT "layers/colors/invert.html" +#define GIMP_HELP_LAYER_EQUALIZE "layers/colors/auto/equalize.html" +#define GIMP_HELP_LAYER_MASK_ADD "dialogs/add_layer_mask.html" +#define GIMP_HELP_LAYER_MASK_APPLY "layers/apply_mask.html" +#define GIMP_HELP_LAYER_MASK_DELETE "layers/delete_mask.html" +#define GIMP_HELP_LAYER_MASK_SELECTION_REPLACE "layers/mask_to_selection.html" +#define GIMP_HELP_LAYER_MASK_SELECTION_ADD "layers/mask_to_selection.html#add" +#define GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT "layers/mask_to_selection.html#subtract" +#define GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT "layers/mask_to_selection.html#intersect" +#define GIMP_HELP_LAYER_ALPHA_ADD "layers/add_alpha_channel.html" +#define GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE "layers/alpha_to_selection.html" +#define GIMP_HELP_LAYER_ALPHA_SELECTION_ADD "layers/alpha_to_selection.html#add" +#define GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT "layers/alpha_to_selection.html#subtract" +#define GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT "layers/alpha_to_selection.html#intersect" +#define GIMP_HELP_LAYER_FLIP_HORIZONTAL "layers/flip_layer.html" +#define GIMP_HELP_LAYER_FLIP_VERTICAL "layers/flip_layer.html" +#define GIMP_HELP_LAYER_ROTATE_90 "layers/rotate_layer.html" +#define GIMP_HELP_LAYER_ROTATE_180 "layers/rotate_layer.html" +#define GIMP_HELP_LAYER_ROTATE_270 "layers/rotate_layer.html" +#define GIMP_HELP_LAYER_OFFSET "dialogs/offset.html" +#define GIMP_HELP_LAYER_RESIZE "dialogs/layer_boundary_size.html" +#define GIMP_HELP_LAYER_RESIZE_TO_IMAGE "layers/layer_to_image_size.html" +#define GIMP_HELP_LAYER_SCALE "dialogs/scale_layer.html" +#define GIMP_HELP_LAYER_CROP "dialogs/crop_layer.html" +#define GIMP_HELP_LAYER_EDIT "dialogs/edit_layer_attributes.html" -#define GIMP_HELP_CHANNEL_DIALOG "channels/dialogs/channels_dialog.html" -#define GIMP_HELP_CHANNEL_NEW "channels/dialogs/new_channel.html" -#define GIMP_HELP_CHANNEL_RAISE "channels/raise_channel.html" -#define GIMP_HELP_CHANNEL_LOWER "channels/lower_channel.html" -#define GIMP_HELP_CHANNEL_DUPLICATE "channels/duplicate_channel.html" -#define GIMP_HELP_CHANNEL_DELETE "channels/delete_channel.html" -#define GIMP_HELP_CHANNEL_SEL_REPLACE "channels/channel_to_selection.html" -#define GIMP_HELP_CHANNEL_SEL_ADD "channels/channel_to_selection.html#add" -#define GIMP_HELP_CHANNEL_SEL_SUB "channels/channel_to_selection.html#subtract" -#define GIMP_HELP_CHANNEL_SEL_INTERSECT "channels/channel_to_selection.html#intersect" -#define GIMP_HELP_CHANNEL_EDIT "channels/dialogs/edit_channel_attributes.html" +#define GIMP_HELP_CHANNEL_DIALOG "dialogs/channels_dialog.html" +#define GIMP_HELP_CHANNEL_NEW "dialogs/new_channel.html" +#define GIMP_HELP_CHANNEL_RAISE "channels/raise_channel.html" +#define GIMP_HELP_CHANNEL_LOWER "channels/lower_channel.html" +#define GIMP_HELP_CHANNEL_DUPLICATE "channels/duplicate_channel.html" +#define GIMP_HELP_CHANNEL_DELETE "channels/delete_channel.html" +#define GIMP_HELP_CHANNEL_SELECTION_REPLACE "channels/channel_to_selection.html" +#define GIMP_HELP_CHANNEL_SELECTION_ADD "channels/channel_to_selection.html#add" +#define GIMP_HELP_CHANNEL_SELECTION_SUBTRACT "channels/channel_to_selection.html#subtract" +#define GIMP_HELP_CHANNEL_SELECTION_INTERSECT "channels/channel_to_selection.html#intersect" +#define GIMP_HELP_CHANNEL_EDIT "dialogs/edit_channel_attributes.html" -#define GIMP_HELP_PATH_DIALOG "paths/dislogs/paths_dialog.html" -#define GIMP_HELP_PATH_NEW "paths/new_path.html" -#define GIMP_HELP_PATH_RAISE "paths/raise_path.html" -#define GIMP_HELP_PATH_LOWER "paths/lower_path.html" -#define GIMP_HELP_PATH_DUPLICATE "paths/duplicate_path.html" -#define GIMP_HELP_PATH_DELETE "paths/delete_path.html" -#define GIMP_HELP_PATH_SEL_REPLACE "paths/path_to_selection.html" -#define GIMP_HELP_PATH_SEL_ADD "paths/path_to_selection.html#add" -#define GIMP_HELP_PATH_SEL_SUB "paths/path_to_selection.html#subtract" -#define GIMP_HELP_PATH_SEL_INTERSECT "paths/path_to_selection.html#intersect" -#define GIMP_HELP_PATH_STROKE "paths/stroke_path.html" -#define GIMP_HELP_PATH_COPY "paths/copy_path.html" -#define GIMP_HELP_PATH_PASTE "paths/paste_path.html" -#define GIMP_HELP_PATH_IMPORT "paths/dialogs/import_path.html" -#define GIMP_HELP_PATH_EXPORT "paths/dialogs/export_path.html" -#define GIMP_HELP_PATH_EDIT "paths/dialogs/edit_path_attributes.html" +#define GIMP_HELP_QMASK_TOGGLE "select/quickmask.html" +#define GIMP_HELP_QMASK_INVERT "select/quickmask.html" +#define GIMP_HELP_QMASK_EDIT "dialogs/edit_qmask_attributes.html" -#define GIMP_HELP_TOOL_BY_COLOR_SELECT "tools/by_color_select.html" -#define GIMP_HELP_TOOL_COLOR_BALANCE "tools/color_balance.html" -#define GIMP_HELP_TOOL_HUE_SATURATION "tools/hue_saturation.html" -#define GIMP_HELP_TOOL_COLORIZE "tools/colorize.html" -#define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST "tools/brightness-contrast.html" -#define GIMP_HELP_TOOL_THRESHOLD "tools/threshold.html" -#define GIMP_HELP_TOOL_LEVELS "tools/levels.html" -#define GIMP_HELP_TOOL_CURVES "tools/curves.html" -#define GIMP_HELP_TOOL_POSTERIZE "tools/posterize.html" -#define GIMP_HELP_TOOL_HISTOGRAM "tools/histogram.html" -#define GIMP_HELP_TOOL_ROTATE "tools/rotate.html" -#define GIMP_HELP_TOOL_VECTORS "tools/vectors.html" +#define GIMP_HELP_PATH_DIALOG "paths/dislogs/paths_dialog.html" +#define GIMP_HELP_PATH_NEW "paths/new_path.html" +#define GIMP_HELP_PATH_RAISE "paths/raise_path.html" +#define GIMP_HELP_PATH_LOWER "paths/lower_path.html" +#define GIMP_HELP_PATH_DUPLICATE "paths/duplicate_path.html" +#define GIMP_HELP_PATH_DELETE "paths/delete_path.html" +#define GIMP_HELP_PATH_SELECTION_REPLACE "paths/path_to_selection.html" +#define GIMP_HELP_PATH_SELECTION_ADD "paths/path_to_selection.html#add" +#define GIMP_HELP_PATH_SELECTION_SUBTRACT "paths/path_to_selection.html#subtract" +#define GIMP_HELP_PATH_SELECTION_INTERSECT "paths/path_to_selection.html#intersect" +#define GIMP_HELP_PATH_STROKE "paths/stroke_path.html" +#define GIMP_HELP_PATH_COPY "paths/copy_path.html" +#define GIMP_HELP_PATH_PASTE "paths/paste_path.html" +#define GIMP_HELP_PATH_IMPORT "dialogs/import_path.html" +#define GIMP_HELP_PATH_EXPORT "dialogs/export_path.html" +#define GIMP_HELP_PATH_EDIT "dialogs/edit_path_attributes.html" -#define GIMP_HELP_FILTER_REPEAT "filters/repeat_last.html" -#define GIMP_HELP_FILTER_RESHOW "filters/reshow_last.html" +#define GIMP_HELP_TOOL_AIRBRUSH "tools/airbrush.html" +#define GIMP_HELP_TOOL_BLEND "tools/blend.html" +#define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST "tools/brightness-contrast.html" +#define GIMP_HELP_TOOL_BUCKET_FILL "tools/bucket_fill.html" +#define GIMP_HELP_TOOL_BY_COLOR_SELECT "tools/by_color_select.html" +#define GIMP_HELP_TOOL_CLONE "tools/clone.html" +#define GIMP_HELP_TOOL_COLORIZE "tools/colorize.html" +#define GIMP_HELP_TOOL_COLOR_BALANCE "tools/color_balance.html" +#define GIMP_HELP_TOOL_COLOR_PICKER "tools/color_picker.html" +#define GIMP_HELP_TOOL_CONVOLVE "tools/convolve.html" +#define GIMP_HELP_TOOL_CROP "tools/crop.html" +#define GIMP_HELP_TOOL_CURVES "tools/curves.html" +#define GIMP_HELP_TOOL_CURVES "tools/curves.html" +#define GIMP_HELP_TOOL_DODGE_BURN "tools/dodge_burn.html" +#define GIMP_HELP_TOOL_ELLIPSE_SELECT "tools/ellipse_select.html" +#define GIMP_HELP_TOOL_ERASER "tools/eraser.html" +#define GIMP_HELP_TOOL_FLIP "tools/flip.html" +#define GIMP_HELP_TOOL_FREE_SELECT "tools/free_select.html" +#define GIMP_HELP_TOOL_FUZZY_SELECT "tools/fuzzy_select.html" +#define GIMP_HELP_TOOL_HISTOGRAM "tools/histogram.html" +#define GIMP_HELP_TOOL_HUE_SATURATION "tools/hue_saturation.html" +#define GIMP_HELP_TOOL_INK "tools/ink.html" +#define GIMP_HELP_TOOL_ISCISSORS "tools/iscissors.html" +#define GIMP_HELP_TOOL_LEVELS "tools/levels.html" +#define GIMP_HELP_TOOL_MEASURE "tools/measure.html" +#define GIMP_HELP_TOOL_MOVE "tools/move.html" +#define GIMP_HELP_TOOL_PATH "tools/path.html" +#define GIMP_HELP_TOOL_PAINTBRUSH "tools/paintbrush.html" +#define GIMP_HELP_TOOL_PENCIL "tools/pencil.html" +#define GIMP_HELP_TOOL_PERSPECTIVE "tools/perspective.html" +#define GIMP_HELP_TOOL_POSTERIZE "tools/posterize.html" +#define GIMP_HELP_TOOL_RECT_SELECT "tools/rect_select.html" +#define GIMP_HELP_TOOL_ROTATE "tools/rotate.html" +#define GIMP_HELP_TOOL_SCALE "tools/scale.html" +#define GIMP_HELP_TOOL_SHEAR "tools/shear.html" +#define GIMP_HELP_TOOL_SMUDGE "tools/smudge.html" +#define GIMP_HELP_TOOL_TEXT "tools/text.html" +#define GIMP_HELP_TOOL_THRESHOLD "tools/threshold.html" +#define GIMP_HELP_TOOL_VECTORS "tools/vectors.html" +#define GIMP_HELP_TOOL_ZOOM "tools/zoom.html" -#define GIMP_HELP_TOOLBOX "toolbox/toolbox.html" -#define GIMP_HELP_TOOLBOX_DEFAULT_COLORS "toolbox/toolbox.html#default_colors" -#define GIMP_HELP_TOOLBOX_SWAP_COLORS "toolbox/toolbox.html#swap_colors" +#define GIMP_HELP_FILTER_REPEAT "filters/repeat_last.html" +#define GIMP_HELP_FILTER_RESHOW "filters/reshow_last.html" -#define GIMP_HELP_BRUSH_DIALOG "dialogs/brush_selection.html" -#define GIMP_HELP_BRUSH_NEW "dialogs/brush_selection.html" -#define GIMP_HELP_BRUSH_DUPLICATE "dialogs/brush_selection.html" -#define GIMP_HELP_BRUSH_EDIT "dialogs/brush_selection.html" -#define GIMP_HELP_BRUSH_DELETE "dialogs/brush_selection.html" -#define GIMP_HELP_BRUSH_REFRESH "dialogs/brush_selection.html" +#define GIMP_HELP_TOOLBOX "toolbox/toolbox.html" +#define GIMP_HELP_TOOLBOX_DEFAULT_COLORS "toolbox/toolbox.html#default_colors" +#define GIMP_HELP_TOOLBOX_SWAP_COLORS "toolbox/toolbox.html#swap_colors" -#define GIMP_HELP_PATTERN_DIALOG "dialogs/pattern_selection.html" -#define GIMP_HELP_PATTERN_NEW "dialogs/pattern_selection.html" -#define GIMP_HELP_PATTERN_DUPLICATE "dialogs/pattern_selection.html" -#define GIMP_HELP_PATTERN_EDIT "dialogs/pattern_selection.html" -#define GIMP_HELP_PATTERN_DELETE "dialogs/pattern_selection.html" -#define GIMP_HELP_PATTERN_REFRESH "dialogs/pattern_selection.html" +#define GIMP_HELP_BRUSH_DIALOG "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_NEW "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_DUPLICATE "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_EDIT "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_DELETE "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_REFRESH "dialogs/brush_selection.html" -#define GIMP_HELP_GRADIENT_DIALOG "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_NEW "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_DUPLICATE "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_EDIT "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_DELETE "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_REFRESH "dialogs/gradient_selection.html" -#define GIMP_HELP_GRADIENT_SAVE_AS_POV "dialogs/gradient_selection.html" +#define GIMP_HELP_PATTERN_DIALOG "dialogs/pattern_selection.html" +#define GIMP_HELP_PATTERN_NEW "dialogs/pattern_selection.html" +#define GIMP_HELP_PATTERN_DUPLICATE "dialogs/pattern_selection.html" +#define GIMP_HELP_PATTERN_EDIT "dialogs/pattern_selection.html" +#define GIMP_HELP_PATTERN_DELETE "dialogs/pattern_selection.html" +#define GIMP_HELP_PATTERN_REFRESH "dialogs/pattern_selection.html" -#define GIMP_HELP_PALETTE_DIALOG "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_NEW "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_DUPLICATE "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_EDIT "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_DELETE "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_REFRESH "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_IMPORT "dialogs/palette_selection.html" -#define GIMP_HELP_PALETTE_MERGE "dialogs/palette_selection.html" +#define GIMP_HELP_GRADIENT_DIALOG "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_NEW "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_DUPLICATE "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_EDIT "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_DELETE "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_REFRESH "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_SAVE_AS_POV "dialogs/gradient_selection.html" -#define GIMP_HELP_FONT_DIALOG "dialogs/font_selection.html" +#define GIMP_HELP_PALETTE_DIALOG "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_NEW "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_DUPLICATE "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_EDIT "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_DELETE "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_REFRESH "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_IMPORT "dialogs/palette_selection.html" +#define GIMP_HELP_PALETTE_MERGE "dialogs/palette_selection.html" -#define GIMP_HELP_BUFFER_DIALOG "dialogs/named_buffers.html" -#define GIMP_HELP_BUFFER_CUT "dialogs/cut_named.html" -#define GIMP_HELP_BUFFER_COPY "dialogs/copy_named.html" -#define GIMP_HELP_BUFFER_PASTE "dialogs/paste_named.html" -#define GIMP_HELP_BUFFER_PASTE_INTO "dialogs/paste_named.html" -#define GIMP_HELP_BUFFER_PASTE_AS_NEW "dialogs/paste_named.html" -#define GIMP_HELP_BUFFER_DELETE "dialogs/delete_buffer.html" +#define GIMP_HELP_FONT_DIALOG "dialogs/font_selection.html" -#define GIMP_HELP_TEMPLATE_DIALOG "dialogs/templates.html" -#define GIMP_HELP_TEMPLATE_NEW "dialogs/templates.html" -#define GIMP_HELP_TEMPLATE_DUPLICATE "dialogs/templates.html" -#define GIMP_HELP_TEMPLATE_EDIT "dialogs/templates.html" -#define GIMP_HELP_TEMPLATE_IMAGE_NEW "dialogs/templates.html" -#define GIMP_HELP_TEMPLATE_DELETE "dialogs/templates.html" +#define GIMP_HELP_BUFFER_DIALOG "dialogs/named_buffers.html" +#define GIMP_HELP_BUFFER_CUT "dialogs/cut_named.html" +#define GIMP_HELP_BUFFER_COPY "dialogs/copy_named.html" +#define GIMP_HELP_BUFFER_PASTE "dialogs/paste_named.html" +#define GIMP_HELP_BUFFER_PASTE_INTO "dialogs/paste_named.html" +#define GIMP_HELP_BUFFER_PASTE_AS_NEW "dialogs/paste_named.html" +#define GIMP_HELP_BUFFER_DELETE "dialogs/delete_buffer.html" -#define GIMP_HELP_PREFERENCES_DIALOG "file/dialogs/preferences/preferences.html" +#define GIMP_HELP_TEMPLATE_DIALOG "dialogs/templates.html" +#define GIMP_HELP_TEMPLATE_NEW "dialogs/templates.html" +#define GIMP_HELP_TEMPLATE_DUPLICATE "dialogs/templates.html" +#define GIMP_HELP_TEMPLATE_EDIT "dialogs/templates.html" +#define GIMP_HELP_TEMPLATE_IMAGE_NEW "dialogs/templates.html" +#define GIMP_HELP_TEMPLATE_DELETE "dialogs/templates.html" -#define GIMP_HELP_COLOR_DIALOG "dialogs/color.html" -#define GIMP_HELP_TOOL_OPTIONS_DIALOG "dialogs/tool_options.html" -#define GIMP_HELP_DEVICE_STATUS_DIALOG "dialogs/device_status.html" -#define GIMP_HELP_DOCUMENT_DIALOG "file/dialogs/document_index.html" -#define GIMP_HELP_MODULE_DIALOG "dialogs/module_manager.html" -#define GIMP_HELP_INFO_DIALOG "view/dialogs/info_window.html" -#define GIMP_HELP_NAVIGATION_DIALOG "view/dialogs/navigation_window.html" -#define GIMP_HELP_DISPLAY_FILTER_DIALOG "dialogs/display_filters/display_filters.html" -#define GIMP_HELP_UNDO_DIALOG "dialogs/undo_history.html" -#define GIMP_HELP_INDEXED_PALETTE_DIALOG "dialogs/indexed_palette.html" -#define GIMP_HELP_ERROR_DIALOG "dialogs/error_console.html" -#define GIMP_HELP_TIPS_DIALOG "help/dialogs/tip_of_the_day.html" -#define GIMP_HELP_ABOUT_DIALOG "help/dialogs/about.html" +#define GIMP_HELP_PREFS_DIALOG "dialogs/preferences/preferences.html" +#define GIMP_HELP_PREFS_NEW_IMAGE "dialogs/preferences/new_file.html" +#define GIMP_HELP_PREFS_NEW_IMAGE_COMMENT "dialogs/preferences/new_file.html#default_comment" +#define GIMP_HELP_PREFS_INTERFACE "dialogs/preferences/interface.html" +#define GIMP_HELP_PREFS_HELP "dialogs/preferences/interface.html#help_system" +#define GIMP_HELP_PREFS_TOOL_OPTIONS "dialogs/preferences/interface.html#tool_options" +#define GIMP_HELP_PREFS_INPUT_DEVICES "dialogs/preferences/input_devices.html" +#define GIMP_HELP_PREFS_IMAGE_WINDOW "dialogs/preferences/interface.html#image_windows" +#define GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE "dialogs/preferences/interface.html#image_windows" +#define GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE "dialogs/preferences/interface.html#image_windows" +#define GIMP_HELP_PREFS_DISPLAY "dialogs/preferences/display.html" +#define GIMP_HELP_PREFS_MONITOR "dialogs/preferences/monitor.html" +#define GIMP_HELP_PREFS_ENVIRONMENT "dialogs/preferences/environment.html" +#define GIMP_HELP_PREFS_FOLDERS "dialogs/preferences/folders.html" +#define GIMP_HELP_PREFS_FOLDERS_BRUSHES "dialogs/preferences/folders.html#brushes" +#define GIMP_HELP_PREFS_FOLDERS_PATTERNS "dialogs/preferences/folders.html#patterns" +#define GIMP_HELP_PREFS_FOLDERS_PALETTES "dialogs/preferences/folders.html#palettes" +#define GIMP_HELP_PREFS_FOLDERS_GRADIENTS "dialogs/preferences/folders.html#gradients" +#define GIMP_HELP_PREFS_FOLDERS_PLUG_INS "dialogs/preferences/folders.html#plug_ins" +#define GIMP_HELP_PREFS_FOLDERS_SCRIPTS "dialogs/preferences/folders.html#scripts" +#define GIMP_HELP_PREFS_FOLDERS_MODULES "dialogs/preferences/folders.html#modules" +#define GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT "dialogs/preferences/folders.html#environ" +#define GIMP_HELP_PREFS_FOLDERS_THEMES "dialogs/preferences/folders.html#themes" -#define GIMP_HELP_HELP "help/dialogs/help.html" -#define GIMP_HELP_HELP_CONTEXT "help/context_help.html" +#define GIMP_HELP_COLOR_DIALOG "dialogs/color.html" +#define GIMP_HELP_TOOL_OPTIONS_DIALOG "dialogs/tool_options.html" +#define GIMP_HELP_DEVICE_STATUS_DIALOG "dialogs/device_status.html" +#define GIMP_HELP_DOCUMENT_DIALOG "dialogs/document_index.html" +#define GIMP_HELP_MODULE_DIALOG "dialogs/module_manager.html" +#define GIMP_HELP_INFO_DIALOG "dialogs/info_window.html" +#define GIMP_HELP_NAVIGATION_DIALOG "dialogs/navigation_window.html" +#define GIMP_HELP_DISPLAY_FILTER_DIALOG "dialogs/display_filters/display_filters.html" +#define GIMP_HELP_UNDO_DIALOG "dialogs/undo_history.html" +#define GIMP_HELP_INDEXED_PALETTE_DIALOG "dialogs/indexed_palette.html" +#define GIMP_HELP_ERROR_DIALOG "dialogs/error_console.html" +#define GIMP_HELP_TIPS_DIALOG "dialogs/tip_of_the_day.html" +#define GIMP_HELP_ABOUT_DIALOG "dialogs/about.html" + +#define GIMP_HELP_HELP "dialogs/help.html" +#define GIMP_HELP_HELP_CONTEXT "help/context_help.html" #endif /* __GIMP_HELP_IDS_H__ */ diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index 9fdb178e8a..e63f33bf24 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -32,6 +32,7 @@ #include "core/gimp.h" +#include "gimphelp-ids.h" #include "gimpitemfactory.h" #include "gimpwidgets-utils.h" @@ -902,11 +903,10 @@ gimp_item_factory_item_key_press (GtkWidget *widget, */ if (kevent->keyval != GDK_F1) { - if (help_page && - gtk_accelerator_valid (kevent->keyval, 0) && - (item_factory == gimp_item_factory_from_path ("")) && - (strcmp (help_page, "help/dialogs/help.html") == 0 || - strcmp (help_page, "help/context_help.html") == 0)) + if (help_page && + gtk_accelerator_valid (kevent->keyval, 0) && + (strcmp (help_page, GIMP_HELP_HELP) == 0 || + strcmp (help_page, GIMP_HELP_HELP_CONTEXT) == 0)) { return TRUE; } diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index 7400f0dfb8..cd814b7a0c 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -34,6 +34,7 @@ #include "gimpdevices.h" #include "gimpdialogfactory.h" +#include "gimphelp-ids.h" #include "gimpitemfactory.h" #include "gimptoolbox.h" #include "gimptoolbox-color-area.h" @@ -188,10 +189,8 @@ gimp_toolbox_init (GimpToolbox *toolbox) gtk_window_add_accel_group (GTK_WINDOW (toolbox), GTK_ITEM_FACTORY (toolbox_factory)->accel_group); - /* Connect the "F1" help key */ - gimp_help_connect (GTK_WIDGET (toolbox), - gimp_standard_help_func, - "toolbox/toolbox.html"); + gimp_help_connect (GTK_WIDGET (toolbox), gimp_standard_help_func, + GIMP_HELP_TOOLBOX); toolbox->wbox = gtk_hwrap_box_new (FALSE); gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->wbox), GTK_JUSTIFY_TOP);