diff --git a/ChangeLog b/ChangeLog index ee281f7793..4e21ff8265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2003-08-24 Michael Natterer + + * app/display/gimpdisplayshell-filter-dialog.c + * app/display/gimpdisplayshell-scale.c + * app/display/gimpnavigationview.c + * app/gui/dialogs-menu.c + * app/gui/documents-menu.c + * app/gui/error-console-menu.c + * app/gui/gradient-editor-commands.c + * app/gui/gradient-editor-menu.c + * app/gui/image-menu.c + * app/gui/select-commands.c + * app/gui/tool-options-dialog.c + * app/gui/toolbox-menu.c + * app/gui/vectors-menu.c + * app/widgets/gimpbufferview.c + * app/widgets/gimpchanneltreeview.c + * app/widgets/gimpdocumentview.c + * app/widgets/gimpeditor.[ch] + * app/widgets/gimperrorconsole.c + * app/widgets/gimpgradienteditor.c + * app/widgets/gimpitemtreeview.[ch] + * app/widgets/gimplayertreeview.c + * app/widgets/gimpselectioneditor.c + * app/widgets/gimptemplateview.c + * app/widgets/gimpundoeditor.c + * app/widgets/gimpvectorstreeview.c + * app/widgets/gimphelp-ids.h: added and updated more help IDs. + 2003-08-24 Sven Neumann * app/paint-funcs/paint-funcs-generic.h (blend_pixels): removed diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 079e2a5aa6..af2d0b1f12 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -29,6 +29,7 @@ #include "core/gimpgradient.h" #include "widgets/gimpgradienteditor.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "color-notebook.h" @@ -525,7 +526,7 @@ gradient_editor_replicate_cmd_callback (GtkWidget *widget, title, "gradient_segment_replicate", GIMP_STOCK_TOOL_BLEND, desc, gimp_standard_help_func, - "dialogs/gradient_editor/replicate_segment.html", + GIMP_HELP_GRADIENT_EDITOR_REPLICATE, GTK_STOCK_CANCEL, gradient_editor_dialog_cancel_callback, @@ -632,7 +633,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkWidget *widget, title, "gradient_segment_split_uniformly", GIMP_STOCK_TOOL_BLEND, desc, gimp_standard_help_func, - "dialogs/gradient_editor/split_segments_uniformly.html", + GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM, GTK_STOCK_CANCEL, gradient_editor_dialog_cancel_callback, diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c index b952128f3f..efd78a61d3 100644 --- a/app/actions/select-commands.c +++ b/app/actions/select-commands.c @@ -148,7 +148,7 @@ select_feather_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Feather Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_FEATHER, + GIMP_HELP_SELECTION_FEATHER, _("Feather Selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, @@ -183,7 +183,7 @@ select_shrink_cmd_callback (GtkWidget *widget, shrink_dialog = gimp_query_size_box (_("Shrink Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_SHRINK, + GIMP_HELP_SELECTION_SHRINK, _("Shrink Selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, @@ -216,7 +216,7 @@ select_grow_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Grow Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_GROW, + GIMP_HELP_SELECTION_GROW, _("Grow Selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, @@ -238,7 +238,7 @@ select_border_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Border Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_BORDER, + GIMP_HELP_SELECTION_BORDER, _("Border Selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index a3d5f44b37..dde7bd23c1 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -28,6 +28,7 @@ #include "core/gimpimage.h" #include "widgets/gimpeditor.h" +#include "widgets/gimphelp-ids.h" #include "gimpdisplay.h" #include "gimpdisplayshell.h" @@ -123,7 +124,7 @@ make_dialog (ColorDisplayDialog *cdd) cdd->dialog = gimp_dialog_new (_("Color Display Filters"), "display_filters", gimp_standard_help_func, - "dialogs/display_filters/display_filters.html", + GIMP_HELP_DISPLAY_FILTER_DIALOG, GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, @@ -148,7 +149,7 @@ make_dialog (ColorDisplayDialog *cdd) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0); gtk_widget_show (scrolled_win); @@ -240,7 +241,7 @@ make_dialog (ColorDisplayDialog *cdd) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (editor), scrolled_win); gtk_widget_show (scrolled_win); @@ -329,7 +330,7 @@ color_display_cancel_callback (GtkWidget *widget, gtk_widget_destroy (GTK_WIDGET (cdd->dialog)); cdd->shell->filters_dialog = NULL; - + if (cdd->modified) { list = cdd->shell->filters; @@ -349,7 +350,7 @@ color_display_cancel_callback (GtkWidget *widget, } } -static void +static void color_display_update_up_and_down (ColorDisplayDialog *cdd) { GtkTreeModel *model; diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index ced0d4dd88..11b229aacb 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -36,6 +36,7 @@ #include "tools/tool_manager.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "gimpdisplay.h" @@ -474,7 +475,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) GTK_STOCK_ZOOM_100, _("Select Zoom Ratio"), gimp_standard_help_func, - "dialogs/display_scale.html", + GIMP_HELP_VIEW_ZOOM_OTHER, GTK_STOCK_CANCEL, gimp_display_shell_scale_dialog_cancel, diff --git a/app/gui/dialogs-menu.c b/app/gui/dialogs-menu.c index f324240f59..1fb89ae824 100644 --- a/app/gui/dialogs-menu.c +++ b/app/gui/dialogs-menu.c @@ -31,6 +31,7 @@ #include "widgets/gimpdialogfactory.h" #include "widgets/gimpdockable.h" #include "widgets/gimpdockbook.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpimagedock.h" #include "widgets/gimpitemfactory.h" @@ -41,9 +42,10 @@ #include "gimp-intl.h" -#define ADD_TAB(path,id,type,stock_id) \ - { { (path), "foo", dialogs_add_tab_cmd_callback, 0, (type), (stock_id) }, \ - (id), NULL, NULL } +#define ADD_TAB(path,id,stock_id,help_id) \ + { { (path), "", dialogs_add_tab_cmd_callback, 0, \ + "", (stock_id) }, \ + (id), (help_id), NULL } #define PREVIEW_SIZE(path,size) \ { { (path), NULL, dialogs_preview_size_cmd_callback, \ (size), "/Preview Size/Tiny" }, NULL, NULL, NULL } @@ -60,58 +62,60 @@ GimpItemFactoryEntry dialogs_menu_entries[] = MENU_BRANCH ("/_Add Tab"), ADD_TAB (N_("/Add Tab/Tool _Options..."), "gimp-tool-options", - "", GIMP_STOCK_TOOL_OPTIONS), + GIMP_STOCK_TOOL_OPTIONS, GIMP_HELP_TOOL_OPTIONS_DIALOG), ADD_TAB (N_("/Add Tab/_Device Status..."), "gimp-device-status", - "", GIMP_STOCK_DEVICE_STATUS), + GIMP_STOCK_DEVICE_STATUS, GIMP_HELP_DEVICE_STATUS_DIALOG), MENU_SEPARATOR ("/Add Tab/---"), ADD_TAB (N_("/Add Tab/_Layers..."), "gimp-layer-list", - "", GIMP_STOCK_LAYERS), + GIMP_STOCK_LAYERS, GIMP_HELP_LAYER_DIALOG), ADD_TAB (N_("/Add Tab/_Channels..."), "gimp-channel-list", - "", GIMP_STOCK_CHANNELS), + GIMP_STOCK_CHANNELS, GIMP_HELP_CHANNEL_DIALOG), ADD_TAB (N_("/Add Tab/_Paths..."), "gimp-vectors-list", - "", GIMP_STOCK_PATHS), + GIMP_STOCK_PATHS, GIMP_HELP_PATH_DIALOG), ADD_TAB (N_("/Add Tab/_Indexed Palette..."), "gimp-indexed-palette", - "", GIMP_STOCK_INDEXED_PALETTE), + GIMP_STOCK_INDEXED_PALETTE, GIMP_HELP_INDEXED_PALETTE_DIALOG), ADD_TAB (N_("/Add Tab/_Selection Editor..."), "gimp-selection-editor", - "", GIMP_STOCK_TOOL_RECT_SELECT), + GIMP_STOCK_TOOL_RECT_SELECT, GIMP_HELP_SELECTION_DIALOG), ADD_TAB (N_("/Add Tab/Na_vigation..."), "gimp-navigation-view", - "", GIMP_STOCK_NAVIGATION), + GIMP_STOCK_NAVIGATION, GIMP_HELP_NAVIGATION_DIALOG), ADD_TAB (N_("/Add Tab/_Undo History..."), "gimp-undo-history", - "", GIMP_STOCK_UNDO_HISTORY), + GIMP_STOCK_UNDO_HISTORY, GIMP_HELP_UNDO_DIALOG), MENU_SEPARATOR ("/Add Tab/---"), ADD_TAB (N_("/Add Tab/Colo_rs..."), "gimp-color-editor", - "", GIMP_STOCK_DEFAULT_COLORS), + GIMP_STOCK_DEFAULT_COLORS, GIMP_HELP_COLOR_DIALOG), ADD_TAB (N_("/Add Tab/Brus_hes..."), "gimp-brush-grid", - "", GIMP_STOCK_TOOL_PAINTBRUSH), + GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_HELP_BRUSH_DIALOG), ADD_TAB (N_("/Add Tab/P_atterns..."), "gimp-pattern-grid", - "", GIMP_STOCK_TOOL_BUCKET_FILL), + GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_HELP_PATTERN_DIALOG), ADD_TAB (N_("/Add Tab/_Gradients..."), "gimp-gradient-list", - "", GIMP_STOCK_TOOL_BLEND), + GIMP_STOCK_TOOL_BLEND, GIMP_HELP_GRADIENT_DIALOG), ADD_TAB (N_("/Add Tab/Pal_ettes..."), "gimp-palette-list", - "", GTK_STOCK_SELECT_COLOR), + GTK_STOCK_SELECT_COLOR, GIMP_HELP_PALETTE_DIALOG), ADD_TAB (N_("/Add Tab/_Fonts..."), "gimp-font-list", - "", GTK_STOCK_SELECT_FONT), + GTK_STOCK_SELECT_FONT, GIMP_HELP_FONT_DIALOG), ADD_TAB (N_("/Add Tab/_Buffers..."), "gimp-buffer-list", - "", GTK_STOCK_PASTE), + GTK_STOCK_PASTE, GIMP_HELP_BUFFER_DIALOG), MENU_SEPARATOR ("/Add Tab/---"), ADD_TAB (N_("/Add Tab/I_mages..."), "gimp-image-list", - "", GIMP_STOCK_IMAGES), + GIMP_STOCK_IMAGES, GIMP_HELP_IMAGE_DIALOG), ADD_TAB (N_("/Add Tab/Document Histor_y..."), "gimp-document-list", - "", GTK_STOCK_OPEN), + GTK_STOCK_OPEN, GIMP_HELP_DOCUMENT_DIALOG), ADD_TAB (N_("/Add Tab/_Templates..."), "gimp-template-list", - "", GIMP_STOCK_TEMPLATE), + GIMP_STOCK_TEMPLATE, GIMP_HELP_TEMPLATE_DIALOG), ADD_TAB (N_("/Add Tab/Error Co_nsole..."), "gimp-error-console", - "", GIMP_STOCK_WARNING), + GIMP_STOCK_WARNING, GIMP_HELP_ERRORS_DIALOG), MENU_SEPARATOR ("/Add Tab/---"), - ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list", NULL, NULL), + { { N_("/Add Tab/Tools..."), NULL, + dialogs_add_tab_cmd_callback, 0 }, + "gimp-tool-list", NULL, NULL }, { { N_("/_Remove Tab"), NULL, dialogs_remove_tab_cmd_callback, 0, diff --git a/app/gui/documents-menu.c b/app/gui/documents-menu.c index 9bad523cca..900a467a7a 100644 --- a/app/gui/documents-menu.c +++ b/app/gui/documents-menu.c @@ -28,6 +28,7 @@ #include "widgets/gimpcontainereditor.h" #include "widgets/gimpcontainerview.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "documents-commands.h" @@ -42,34 +43,41 @@ GimpItemFactoryEntry documents_menu_entries[] = { { N_("/_Open Image"), "", documents_open_document_cmd_callback, 0, "", GTK_STOCK_OPEN }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_OPEN, NULL }, { { N_("/_Raise or Open Image"), "", documents_raise_or_open_document_cmd_callback, 0, "", GTK_STOCK_OPEN }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_OPEN, NULL }, { { N_("/File Open _Dialog..."), "", documents_file_open_dialog_cmd_callback, 0, "", GTK_STOCK_OPEN }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_OPEN, NULL }, { { N_("/Remove _Entry"), NULL, documents_remove_document_cmd_callback, 0, "", GTK_STOCK_REMOVE }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_REMOVE, NULL }, MENU_SEPARATOR ("/---"), { { N_("/Recreate _Preview"), NULL, documents_recreate_preview_cmd_callback, 0, "", GTK_STOCK_REFRESH }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_REFRESH, NULL }, { { N_("/Reload _all Previews"), NULL, documents_reload_previews_cmd_callback, 0, "", GTK_STOCK_REFRESH }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_REFRESH, NULL }, { { N_("/Remove Dangling E_ntries"), NULL, documents_delete_dangling_documents_cmd_callback, 0, "", GTK_STOCK_REFRESH }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_DOCUMENT_REFRESH, NULL }, }; gint n_documents_menu_entries = G_N_ELEMENTS (documents_menu_entries); diff --git a/app/gui/error-console-menu.c b/app/gui/error-console-menu.c index a345f46e4e..5fbe8c475e 100644 --- a/app/gui/error-console-menu.c +++ b/app/gui/error-console-menu.c @@ -25,6 +25,7 @@ #include "gui-types.h" #include "widgets/gimperrorconsole.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "error-console-commands.h" @@ -38,18 +39,21 @@ GimpItemFactoryEntry error_console_menu_entries[] = { { N_("/_Clear Errors"), "", error_console_clear_cmd_callback, 0, "", GTK_STOCK_CLEAR }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_ERRORS_CLEAR, NULL }, { { "/---", NULL, NULL, 0, "", NULL }, NULL, NULL, NULL }, { { N_("/Save _All Errors to File..."), "", error_console_save_all_cmd_callback, 0, "", GTK_STOCK_SAVE_AS }, - NULL, NULL, NULL }, + NULL, + GIMP_HELP_ERRORS_SAVE, NULL }, { { N_("/Save _Selection to File..."), "", error_console_save_selection_cmd_callback, 0, "", GTK_STOCK_SAVE_AS }, - NULL, NULL, NULL } + NULL, + GIMP_HELP_ERRORS_SAVE, NULL } }; gint n_error_console_menu_entries = G_N_ELEMENTS (error_console_menu_entries); diff --git a/app/gui/gradient-editor-commands.c b/app/gui/gradient-editor-commands.c index 079e2a5aa6..af2d0b1f12 100644 --- a/app/gui/gradient-editor-commands.c +++ b/app/gui/gradient-editor-commands.c @@ -29,6 +29,7 @@ #include "core/gimpgradient.h" #include "widgets/gimpgradienteditor.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpviewabledialog.h" #include "color-notebook.h" @@ -525,7 +526,7 @@ gradient_editor_replicate_cmd_callback (GtkWidget *widget, title, "gradient_segment_replicate", GIMP_STOCK_TOOL_BLEND, desc, gimp_standard_help_func, - "dialogs/gradient_editor/replicate_segment.html", + GIMP_HELP_GRADIENT_EDITOR_REPLICATE, GTK_STOCK_CANCEL, gradient_editor_dialog_cancel_callback, @@ -632,7 +633,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkWidget *widget, title, "gradient_segment_split_uniformly", GIMP_STOCK_TOOL_BLEND, desc, gimp_standard_help_func, - "dialogs/gradient_editor/split_segments_uniformly.html", + GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM, GTK_STOCK_CANCEL, gradient_editor_dialog_cancel_callback, diff --git a/app/gui/gradient-editor-menu.c b/app/gui/gradient-editor-menu.c index e703b0c103..6dbfe24d1d 100644 --- a/app/gui/gradient-editor-menu.c +++ b/app/gui/gradient-editor-menu.c @@ -30,6 +30,7 @@ #include "widgets/gimpdataeditor.h" #include "widgets/gimpgradienteditor.h" +#include "widgets/gimphelp-ids.h" #include "widgets/gimpitemfactory.h" #include "gradient-editor-commands.h" @@ -41,16 +42,20 @@ #define LOAD_LEFT_FROM(num,magic) \ { { "/Load Left Color From/" num, NULL, \ - gradient_editor_load_left_cmd_callback, (magic) }, NULL, NULL, NULL } + gradient_editor_load_left_cmd_callback, (magic) }, \ + NULL, GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD, NULL } #define SAVE_LEFT_TO(num,magic) \ { { "/Save Left Color To/" num, NULL, \ - gradient_editor_save_left_cmd_callback, (magic) }, NULL, NULL, NULL } + gradient_editor_save_left_cmd_callback, (magic) }, \ + NULL, GIMP_HELP_GRADIENT_EDITOR_LEFT_SAVE, NULL } #define LOAD_RIGHT_FROM(num,magic) \ { { "/Load Right Color From/" num, NULL, \ - gradient_editor_load_right_cmd_callback, (magic) }, NULL, NULL, NULL } + gradient_editor_load_right_cmd_callback, (magic) }, \ + NULL, GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD, NULL } #define SAVE_RIGHT_TO(num,magic) \ { { "/Save Right Color To/" num, NULL, \ - gradient_editor_save_right_cmd_callback, (magic) }, NULL, NULL, NULL } + gradient_editor_save_right_cmd_callback, (magic) }, \ + NULL, GIMP_HELP_GRADIENT_EDITOR_RIGHT_SAVE, NULL } GimpItemFactoryEntry gradient_editor_menu_entries[] = @@ -58,7 +63,7 @@ GimpItemFactoryEntry gradient_editor_menu_entries[] = { { N_("/L_eft Endpoint's Color..."), NULL, gradient_editor_left_color_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR, NULL }, MENU_BRANCH (N_("/_Load Left Color From")), @@ -69,15 +74,15 @@ GimpItemFactoryEntry gradient_editor_menu_entries[] = { { N_("/Load Left Color From/_Right Endpoint"), NULL, gradient_editor_load_left_cmd_callback, 1 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD, NULL }, { { N_("/Load Left Color From/_FG Color"), NULL, gradient_editor_load_left_cmd_callback, 2 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD, NULL }, { { N_("/Load Left Color From/_BG Color"), NULL, gradient_editor_load_left_cmd_callback, 3 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD, NULL }, MENU_SEPARATOR ("/Load Left Color From/---"), @@ -110,26 +115,26 @@ GimpItemFactoryEntry gradient_editor_menu_entries[] = { { N_("/R_ight Endpoint's Color..."), NULL, gradient_editor_right_color_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR, NULL }, MENU_BRANCH (N_("/Load Right Color Fr_om")), { { N_("/Load Right Color From/_Right Neighbor's Left Endpoint"), NULL, gradient_editor_load_right_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD, NULL }, { { N_("/Load Right Color From/_Left Endpoint"), NULL, gradient_editor_load_right_cmd_callback, 1 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD, NULL }, { { N_("/Load Right Color From/_FG Color"), NULL, gradient_editor_load_right_cmd_callback, 2 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD, NULL }, { { N_("/Load Right Color From/_BG Color"), NULL, gradient_editor_load_right_cmd_callback, 3 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD, NULL }, MENU_SEPARATOR ("/Load Right Color From/---"), @@ -163,93 +168,93 @@ GimpItemFactoryEntry gradient_editor_menu_entries[] = gradient_editor_blending_func_cmd_callback, GIMP_GRAD_LINEAR, "" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/blendingfunction/_Curved"), NULL, gradient_editor_blending_func_cmd_callback, GIMP_GRAD_CURVED, "/blendingfunction/Linear" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/blendingfunction/_Sinusodial"), NULL, gradient_editor_blending_func_cmd_callback, GIMP_GRAD_SINE, "/blendingfunction/Linear" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/blendingfunction/Spherical (i_ncreasing)"), NULL, gradient_editor_blending_func_cmd_callback, GIMP_GRAD_SPHERE_INCREASING, "/blendingfunction/Linear" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/blendingfunction/Spherical (_decreasing)"), NULL, gradient_editor_blending_func_cmd_callback, GIMP_GRAD_SPHERE_DECREASING, "/blendingfunction/Linear" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/blendingfunction/(Varies)"), NULL, NULL, 0, "/blendingfunction/Linear" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLENDING, NULL }, { { N_("/coloringtype/_RGB"), NULL, gradient_editor_coloring_type_cmd_callback, GIMP_GRAD_RGB, "" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_COLORING, NULL }, { { N_("/coloringtype/HSV (_counter-clockwise hue)"), NULL, gradient_editor_coloring_type_cmd_callback, GIMP_GRAD_HSV_CCW, "/coloringtype/RGB" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_COLORING, NULL }, { { N_("/coloringtype/HSV (clockwise _hue)"), NULL, gradient_editor_coloring_type_cmd_callback, GIMP_GRAD_HSV_CW, "/coloringtype/RGB" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_COLORING, NULL }, { { N_("/coloringtype/(Varies)"), NULL, NULL, 0, "/coloringtype/RGB" }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_COLORING, NULL }, MENU_SEPARATOR ("/---"), { { "/flip", "F", gradient_editor_flip_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_FLIP, NULL }, { { "/replicate", "R", gradient_editor_replicate_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_FLIP, NULL }, { { "/splitmidpoint", "S", gradient_editor_split_midpoint_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT, NULL }, { { "/splituniformly", "U", gradient_editor_split_uniformly_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT, NULL }, { { "/delete", "D", gradient_editor_delete_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_DELETE, NULL }, { { "/recenter", "C", gradient_editor_recenter_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_RECENTER, NULL }, { { "/redistribute", "C", gradient_editor_redistribute_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE, NULL }, MENU_SEPARATOR ("/---"), { { N_("/Ble_nd Endpoints' Colors"), "B", gradient_editor_blend_color_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR, NULL }, { { N_("/Blend Endpoints' Opacit_y"), "B", gradient_editor_blend_opacity_cmd_callback, 0 }, NULL, - NULL, NULL }, + GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY, NULL }, }; #undef LOAD_LEFT_FROM diff --git a/app/gui/image-menu.c b/app/gui/image-menu.c index 27a8bef95e..247da8f246 100644 --- a/app/gui/image-menu.c +++ b/app/gui/image-menu.c @@ -245,12 +245,12 @@ GimpItemFactoryEntry image_menu_entries[] = edit_stroke_cmd_callback, 0, "", GIMP_STOCK_SELECTION_STROKE }, NULL, - GIMP_HELP_EDIT_STROKE_SELECTION, NULL }, + GIMP_HELP_SELECTION_STROKE, NULL }, { { N_("/Edit/St_roke Active Path"), NULL, vectors_stroke_cmd_callback, 0, "", GIMP_STOCK_PATH_STROKE }, NULL, - GIMP_HELP_EDIT_STROKE_PATH, NULL }, + GIMP_HELP_PATH_STROKE, NULL }, MENU_SEPARATOR ("/Edit/---"), @@ -262,21 +262,21 @@ GimpItemFactoryEntry image_menu_entries[] = select_all_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ALL }, NULL, - GIMP_HELP_SELECT_ALL, NULL }, + GIMP_HELP_SELECTION_ALL, NULL }, { { N_("/Select/_None"), "A", select_none_cmd_callback, 0, "", GIMP_STOCK_SELECTION_NONE }, NULL, - GIMP_HELP_SELECT_NONE, NULL }, + GIMP_HELP_SELECTION_NONE, NULL }, { { N_("/Select/_Invert"), "I", select_invert_cmd_callback, 0, "", GIMP_STOCK_INVERT }, NULL, - GIMP_HELP_SELECT_INVERT, NULL }, + GIMP_HELP_SELECTION_INVERT, NULL }, { { N_("/Select/_Float"), "L", select_float_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_FLOAT, NULL }, + GIMP_HELP_SELECTION_FLOAT, NULL }, { { N_("/Select/_By Color"), "O", tools_select_cmd_callback, 0, "", GIMP_STOCK_TOOL_BY_COLOR_SELECT }, @@ -288,25 +288,25 @@ GimpItemFactoryEntry image_menu_entries[] = { { N_("/Select/Fea_ther..."), NULL, select_feather_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_FEATHER, NULL }, + GIMP_HELP_SELECTION_FEATHER, NULL }, { { N_("/Select/_Sharpen"), NULL, select_sharpen_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_SHARPEN, NULL }, + GIMP_HELP_SELECTION_SHARPEN, NULL }, { { N_("/Select/S_hrink..."), NULL, select_shrink_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SHRINK }, NULL, - GIMP_HELP_SELECT_SHRINK, NULL }, + GIMP_HELP_SELECTION_SHRINK, NULL }, { { N_("/Select/_Grow..."), NULL, select_grow_cmd_callback, 0, "", GIMP_STOCK_SELECTION_GROW }, NULL, - GIMP_HELP_SELECT_GROW, NULL }, + GIMP_HELP_SELECTION_GROW, NULL }, { { N_("/Select/Bo_rder..."), NULL, select_border_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_BORDER, NULL }, + GIMP_HELP_SELECTION_BORDER, NULL }, MENU_SEPARATOR ("/Select/---"), @@ -319,7 +319,7 @@ GimpItemFactoryEntry image_menu_entries[] = select_save_cmd_callback, 0, "", GIMP_STOCK_SELECTION_TO_CHANNEL }, NULL, - GIMP_HELP_SELECT_SAVE_TO_CHANNEL, NULL }, + GIMP_HELP_SELECTION_TO_CHANNEL, NULL }, /* /View */ @@ -343,63 +343,63 @@ GimpItemFactoryEntry image_menu_entries[] = view_zoom_out_cmd_callback, 0, "", GTK_STOCK_ZOOM_OUT }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/Zoom _In"), "plus", view_zoom_in_cmd_callback, 0, "", GTK_STOCK_ZOOM_IN }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/Zoom to _Fit Window"), "E", view_zoom_fit_cmd_callback, 0, "", GTK_STOCK_ZOOM_FIT }, NULL, - GIMP_HELP_VIEW_ZOOM_TO_FIT, NULL }, + GIMP_HELP_VIEW_ZOOM_FIT, NULL }, MENU_SEPARATOR ("/View/Zoom/---"), { { N_("/View/Zoom/16:1"), NULL, view_zoom_cmd_callback, 1601, "" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/8:1"), NULL, view_zoom_cmd_callback, 801, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/4:1"), NULL, view_zoom_cmd_callback, 401, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/2:1"), NULL, view_zoom_cmd_callback, 201, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_100, NULL }, { { N_("/View/Zoom/1:1"), "1", view_zoom_cmd_callback, 101, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:2"), NULL, view_zoom_cmd_callback, 102, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:4"), NULL, view_zoom_cmd_callback, 104, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:8"), NULL, view_zoom_cmd_callback, 108, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:16"), NULL, view_zoom_cmd_callback, 116, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, MENU_SEPARATOR ("/View/Zoom/---"), { { "/View/Zoom/O_ther...", NULL, view_zoom_other_cmd_callback, 0, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OTHER, NULL }, MENU_SEPARATOR ("/View/---"), @@ -956,7 +956,7 @@ GimpItemFactoryEntry image_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_TOOL_RECT_SELECT }, "gimp-selection-editor", - GIMP_HELP_SELECT_DIALOG, NULL }, + GIMP_HELP_SELECTION_DIALOG, NULL }, { { N_("/Dialogs/Na_vigation..."), NULL, dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_NAVIGATION }, @@ -1027,7 +1027,7 @@ GimpItemFactoryEntry image_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_WARNING }, "gimp-error-console", - GIMP_HELP_ERROR_DIALOG, NULL }, + GIMP_HELP_ERRORS_DIALOG, NULL }, /* /Filters */ diff --git a/app/gui/select-commands.c b/app/gui/select-commands.c index b952128f3f..efd78a61d3 100644 --- a/app/gui/select-commands.c +++ b/app/gui/select-commands.c @@ -148,7 +148,7 @@ select_feather_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Feather Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_FEATHER, + GIMP_HELP_SELECTION_FEATHER, _("Feather Selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, @@ -183,7 +183,7 @@ select_shrink_cmd_callback (GtkWidget *widget, shrink_dialog = gimp_query_size_box (_("Shrink Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_SHRINK, + GIMP_HELP_SELECTION_SHRINK, _("Shrink Selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, @@ -216,7 +216,7 @@ select_grow_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Grow Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_GROW, + GIMP_HELP_SELECTION_GROW, _("Grow Selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, @@ -238,7 +238,7 @@ select_border_cmd_callback (GtkWidget *widget, qbox = gimp_query_size_box (_("Border Selection"), gimp_standard_help_func, - GIMP_HELP_SELECT_BORDER, + GIMP_HELP_SELECTION_BORDER, _("Border Selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, diff --git a/app/gui/tool-options-dialog.c b/app/gui/tool-options-dialog.c index be102d96f8..1cc7a0d934 100644 --- a/app/gui/tool-options-dialog.c +++ b/app/gui/tool-options-dialog.c @@ -31,6 +31,7 @@ #include "widgets/gimpdnd.h" #include "widgets/gimpeditor.h" +#include "widgets/gimphelp-ids.h" #include "tool-options-dialog.h" @@ -115,7 +116,7 @@ tool_options_dialog_create (Gimp *gimp) gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_RESET, _("Reset to factory defaults"), - NULL, + GIMP_HELP_TOOL_OPTIONS_RESET, G_CALLBACK (tool_options_dialog_reset_callback), NULL, user_context); diff --git a/app/gui/toolbox-menu.c b/app/gui/toolbox-menu.c index 298bbf2c09..6ef3fd38e1 100644 --- a/app/gui/toolbox-menu.c +++ b/app/gui/toolbox-menu.c @@ -142,7 +142,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_TOOL_RECT_SELECT }, "gimp-selection-editor", - GIMP_HELP_SELECT_DIALOG, NULL }, + GIMP_HELP_SELECTION_DIALOG, NULL }, { { N_("/File/Dialogs/Na_vigation..."), NULL, dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_NAVIGATION }, @@ -213,7 +213,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_WARNING }, "gimp-error-console", - GIMP_HELP_ERROR_DIALOG, NULL }, + GIMP_HELP_ERRORS_DIALOG, NULL }, #ifdef ENABLE_DEBUG_ENTRIES MENU_BRANCH (N_("/File/D_ebug")), diff --git a/app/gui/vectors-menu.c b/app/gui/vectors-menu.c index d4a287dd34..7323d2ea86 100644 --- a/app/gui/vectors-menu.c +++ b/app/gui/vectors-menu.c @@ -94,7 +94,7 @@ GimpItemFactoryEntry vectors_menu_entries[] = vectors_selection_to_vectors_cmd_callback, 0, "", GIMP_STOCK_SELECTION_TO_PATH }, NULL, - "filters/sel2path.html", NULL }, + GIMP_HELP_SELECTION_TO_PATH, NULL }, { { N_("/Stro_ke Path"), "T", vectors_stroke_cmd_callback, 0, "", GIMP_STOCK_PATH_STROKE }, diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c index 27a8bef95e..247da8f246 100644 --- a/app/menus/image-menu.c +++ b/app/menus/image-menu.c @@ -245,12 +245,12 @@ GimpItemFactoryEntry image_menu_entries[] = edit_stroke_cmd_callback, 0, "", GIMP_STOCK_SELECTION_STROKE }, NULL, - GIMP_HELP_EDIT_STROKE_SELECTION, NULL }, + GIMP_HELP_SELECTION_STROKE, NULL }, { { N_("/Edit/St_roke Active Path"), NULL, vectors_stroke_cmd_callback, 0, "", GIMP_STOCK_PATH_STROKE }, NULL, - GIMP_HELP_EDIT_STROKE_PATH, NULL }, + GIMP_HELP_PATH_STROKE, NULL }, MENU_SEPARATOR ("/Edit/---"), @@ -262,21 +262,21 @@ GimpItemFactoryEntry image_menu_entries[] = select_all_cmd_callback, 0, "", GIMP_STOCK_SELECTION_ALL }, NULL, - GIMP_HELP_SELECT_ALL, NULL }, + GIMP_HELP_SELECTION_ALL, NULL }, { { N_("/Select/_None"), "A", select_none_cmd_callback, 0, "", GIMP_STOCK_SELECTION_NONE }, NULL, - GIMP_HELP_SELECT_NONE, NULL }, + GIMP_HELP_SELECTION_NONE, NULL }, { { N_("/Select/_Invert"), "I", select_invert_cmd_callback, 0, "", GIMP_STOCK_INVERT }, NULL, - GIMP_HELP_SELECT_INVERT, NULL }, + GIMP_HELP_SELECTION_INVERT, NULL }, { { N_("/Select/_Float"), "L", select_float_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_FLOAT, NULL }, + GIMP_HELP_SELECTION_FLOAT, NULL }, { { N_("/Select/_By Color"), "O", tools_select_cmd_callback, 0, "", GIMP_STOCK_TOOL_BY_COLOR_SELECT }, @@ -288,25 +288,25 @@ GimpItemFactoryEntry image_menu_entries[] = { { N_("/Select/Fea_ther..."), NULL, select_feather_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_FEATHER, NULL }, + GIMP_HELP_SELECTION_FEATHER, NULL }, { { N_("/Select/_Sharpen"), NULL, select_sharpen_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_SHARPEN, NULL }, + GIMP_HELP_SELECTION_SHARPEN, NULL }, { { N_("/Select/S_hrink..."), NULL, select_shrink_cmd_callback, 0, "", GIMP_STOCK_SELECTION_SHRINK }, NULL, - GIMP_HELP_SELECT_SHRINK, NULL }, + GIMP_HELP_SELECTION_SHRINK, NULL }, { { N_("/Select/_Grow..."), NULL, select_grow_cmd_callback, 0, "", GIMP_STOCK_SELECTION_GROW }, NULL, - GIMP_HELP_SELECT_GROW, NULL }, + GIMP_HELP_SELECTION_GROW, NULL }, { { N_("/Select/Bo_rder..."), NULL, select_border_cmd_callback, 0 }, NULL, - GIMP_HELP_SELECT_BORDER, NULL }, + GIMP_HELP_SELECTION_BORDER, NULL }, MENU_SEPARATOR ("/Select/---"), @@ -319,7 +319,7 @@ GimpItemFactoryEntry image_menu_entries[] = select_save_cmd_callback, 0, "", GIMP_STOCK_SELECTION_TO_CHANNEL }, NULL, - GIMP_HELP_SELECT_SAVE_TO_CHANNEL, NULL }, + GIMP_HELP_SELECTION_TO_CHANNEL, NULL }, /* /View */ @@ -343,63 +343,63 @@ GimpItemFactoryEntry image_menu_entries[] = view_zoom_out_cmd_callback, 0, "", GTK_STOCK_ZOOM_OUT }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/Zoom _In"), "plus", view_zoom_in_cmd_callback, 0, "", GTK_STOCK_ZOOM_IN }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/Zoom to _Fit Window"), "E", view_zoom_fit_cmd_callback, 0, "", GTK_STOCK_ZOOM_FIT }, NULL, - GIMP_HELP_VIEW_ZOOM_TO_FIT, NULL }, + GIMP_HELP_VIEW_ZOOM_FIT, NULL }, MENU_SEPARATOR ("/View/Zoom/---"), { { N_("/View/Zoom/16:1"), NULL, view_zoom_cmd_callback, 1601, "" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/8:1"), NULL, view_zoom_cmd_callback, 801, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/4:1"), NULL, view_zoom_cmd_callback, 401, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_IN, NULL }, { { N_("/View/Zoom/2:1"), NULL, view_zoom_cmd_callback, 201, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_100, NULL }, { { N_("/View/Zoom/1:1"), "1", view_zoom_cmd_callback, 101, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:2"), NULL, view_zoom_cmd_callback, 102, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:4"), NULL, view_zoom_cmd_callback, 104, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:8"), NULL, view_zoom_cmd_callback, 108, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, { { N_("/View/Zoom/1:16"), NULL, view_zoom_cmd_callback, 116, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OUT, NULL }, MENU_SEPARATOR ("/View/Zoom/---"), { { "/View/Zoom/O_ther...", NULL, view_zoom_other_cmd_callback, 0, "/View/Zoom/16:1" }, NULL, - GIMP_HELP_VIEW_ZOOM, NULL }, + GIMP_HELP_VIEW_ZOOM_OTHER, NULL }, MENU_SEPARATOR ("/View/---"), @@ -956,7 +956,7 @@ GimpItemFactoryEntry image_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_TOOL_RECT_SELECT }, "gimp-selection-editor", - GIMP_HELP_SELECT_DIALOG, NULL }, + GIMP_HELP_SELECTION_DIALOG, NULL }, { { N_("/Dialogs/Na_vigation..."), NULL, dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_NAVIGATION }, @@ -1027,7 +1027,7 @@ GimpItemFactoryEntry image_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_WARNING }, "gimp-error-console", - GIMP_HELP_ERROR_DIALOG, NULL }, + GIMP_HELP_ERRORS_DIALOG, NULL }, /* /Filters */ diff --git a/app/menus/toolbox-menu.c b/app/menus/toolbox-menu.c index 298bbf2c09..6ef3fd38e1 100644 --- a/app/menus/toolbox-menu.c +++ b/app/menus/toolbox-menu.c @@ -142,7 +142,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_TOOL_RECT_SELECT }, "gimp-selection-editor", - GIMP_HELP_SELECT_DIALOG, NULL }, + GIMP_HELP_SELECTION_DIALOG, NULL }, { { N_("/File/Dialogs/Na_vigation..."), NULL, dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_NAVIGATION }, @@ -213,7 +213,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] = dialogs_create_dockable_cmd_callback, 0, "", GIMP_STOCK_WARNING }, "gimp-error-console", - GIMP_HELP_ERROR_DIALOG, NULL }, + GIMP_HELP_ERRORS_DIALOG, NULL }, #ifdef ENABLE_DEBUG_ENTRIES MENU_BRANCH (N_("/File/D_ebug")), diff --git a/app/widgets/gimpbufferview.c b/app/widgets/gimpbufferview.c index ccc208297a..2c48ef3933 100644 --- a/app/widgets/gimpbufferview.c +++ b/app/widgets/gimpbufferview.c @@ -36,6 +36,7 @@ #include "gimpcontainerview.h" #include "gimpbufferview.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimp-intl.h" @@ -139,32 +140,32 @@ gimp_buffer_view_new (GimpViewType view_type, buffer_view->paste_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GTK_STOCK_PASTE, - _("Paste"), NULL, + GTK_STOCK_PASTE, _("Paste"), + GIMP_HELP_BUFFER_PASTE, G_CALLBACK (gimp_buffer_view_paste_clicked), NULL, editor); buffer_view->paste_into_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GIMP_STOCK_PASTE_INTO, - _("Paste Into"), NULL, + GIMP_STOCK_PASTE_INTO, _("Paste Into"), + GIMP_HELP_BUFFER_PASTE_INTO, G_CALLBACK (gimp_buffer_view_paste_into_clicked), NULL, editor); buffer_view->paste_as_new_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GIMP_STOCK_PASTE_AS_NEW, - _("Paste as New"), NULL, + GIMP_STOCK_PASTE_AS_NEW, _("Paste as New"), + GIMP_HELP_BUFFER_PASTE_AS_NEW, G_CALLBACK (gimp_buffer_view_paste_as_new_clicked), NULL, editor); buffer_view->delete_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GTK_STOCK_DELETE, - _("Delete"), NULL, + GTK_STOCK_DELETE, _("Delete"), + GIMP_HELP_BUFFER_DELETE, G_CALLBACK (gimp_buffer_view_delete_clicked), NULL, editor); diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c index c223c9e6bc..0e3d12ff38 100644 --- a/app/widgets/gimpchanneltreeview.c +++ b/app/widgets/gimpchanneltreeview.c @@ -36,6 +36,7 @@ #include "gimpchanneltreeview.h" #include "gimpcomponenteditor.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -115,15 +116,23 @@ gimp_channel_tree_view_class_init (GimpChannelTreeViewClass *klass) item_view_class->add_item = (GimpAddItemFunc) gimp_image_add_channel; item_view_class->remove_item = (GimpRemoveItemFunc) gimp_image_remove_channel; - item_view_class->new_desc = _("New Channel"); - item_view_class->duplicate_desc = _("Duplicate Channel"); - item_view_class->edit_desc = _("Edit Channel Attributes"); - item_view_class->delete_desc = _("Delete Channel"); - item_view_class->raise_desc = _("Raise Channel"); - item_view_class->raise_to_top_desc = _("Raise Channel to Top"); - item_view_class->lower_desc = _("Lower Channel"); - item_view_class->lower_to_bottom_desc = _("Lower Channel to Bottom"); - item_view_class->reorder_desc = _("Reorder Channel"); + item_view_class->new_desc = _("New Channel"); + item_view_class->new_help_id = GIMP_HELP_CHANNEL_NEW; + item_view_class->duplicate_desc = _("Duplicate Channel"); + item_view_class->duplicate_help_id = GIMP_HELP_CHANNEL_DUPLICATE; + item_view_class->edit_desc = _("Edit Channel Attributes"); + item_view_class->edit_help_id = GIMP_HELP_CHANNEL_EDIT; + item_view_class->delete_desc = _("Delete Channel"); + item_view_class->delete_help_id = GIMP_HELP_CHANNEL_DELETE; + item_view_class->raise_desc = _("Raise Channel"); + item_view_class->raise_help_id = GIMP_HELP_CHANNEL_RAISE; + item_view_class->raise_to_top_desc = _("Raise Channel to Top"); + item_view_class->raise_to_top_help_id = GIMP_HELP_CHANNEL_RAISE_TO_TOP; + item_view_class->lower_desc = _("Lower Channel"); + item_view_class->lower_help_id = GIMP_HELP_CHANNEL_LOWER; + item_view_class->lower_to_bottom_desc = _("Lower Channel to Bottom"); + item_view_class->lower_to_bottom_help_id = GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM; + item_view_class->reorder_desc = _("Reorder Channel"); } static void @@ -144,7 +153,8 @@ gimp_channel_tree_view_init (GimpChannelTreeView *view) /* To Selection button */ view->toselection_button = gimp_editor_add_button (GIMP_EDITOR (view), - GIMP_STOCK_SELECTION_REPLACE, str, NULL, + GIMP_STOCK_SELECTION_REPLACE, str, + GIMP_HELP_CHANNEL_SELECTION_REPLACE, G_CALLBACK (gimp_channel_tree_view_toselection_clicked), G_CALLBACK (gimp_channel_tree_view_toselection_extended_clicked), view); diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index a3d5f44b37..dde7bd23c1 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -28,6 +28,7 @@ #include "core/gimpimage.h" #include "widgets/gimpeditor.h" +#include "widgets/gimphelp-ids.h" #include "gimpdisplay.h" #include "gimpdisplayshell.h" @@ -123,7 +124,7 @@ make_dialog (ColorDisplayDialog *cdd) cdd->dialog = gimp_dialog_new (_("Color Display Filters"), "display_filters", gimp_standard_help_func, - "dialogs/display_filters/display_filters.html", + GIMP_HELP_DISPLAY_FILTER_DIALOG, GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, @@ -148,7 +149,7 @@ make_dialog (ColorDisplayDialog *cdd) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0); gtk_widget_show (scrolled_win); @@ -240,7 +241,7 @@ make_dialog (ColorDisplayDialog *cdd) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (editor), scrolled_win); gtk_widget_show (scrolled_win); @@ -329,7 +330,7 @@ color_display_cancel_callback (GtkWidget *widget, gtk_widget_destroy (GTK_WIDGET (cdd->dialog)); cdd->shell->filters_dialog = NULL; - + if (cdd->modified) { list = cdd->shell->filters; @@ -349,7 +350,7 @@ color_display_cancel_callback (GtkWidget *widget, } } -static void +static void color_display_update_up_and_down (ColorDisplayDialog *cdd) { GtkTreeModel *model; diff --git a/app/widgets/gimpdocumentview.c b/app/widgets/gimpdocumentview.c index 0e685a7106..2a6c21c3d9 100644 --- a/app/widgets/gimpdocumentview.c +++ b/app/widgets/gimpdocumentview.c @@ -49,6 +49,7 @@ #include "gimpcontainerview.h" #include "gimpdocumentview.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -170,7 +171,8 @@ gimp_document_view_new (GimpViewType view_type, document_view->open_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GTK_STOCK_OPEN, str, NULL, + GTK_STOCK_OPEN, str, + GIMP_HELP_DOCUMENT_OPEN, G_CALLBACK (gimp_document_view_open_clicked), G_CALLBACK (gimp_document_view_open_extended_clicked), editor); @@ -179,8 +181,8 @@ gimp_document_view_new (GimpViewType view_type, document_view->remove_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GTK_STOCK_REMOVE, - _("Remove selected entry"), NULL, + GTK_STOCK_REMOVE, _("Remove selected entry"), + GIMP_HELP_DOCUMENT_REMOVE, G_CALLBACK (gimp_document_view_remove_clicked), NULL, editor); @@ -193,7 +195,8 @@ gimp_document_view_new (GimpViewType view_type, document_view->refresh_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), - GTK_STOCK_REFRESH, str, NULL, + GTK_STOCK_REFRESH, str, + GIMP_HELP_DOCUMENT_REFRESH, G_CALLBACK (gimp_document_view_refresh_clicked), G_CALLBACK (gimp_document_view_refresh_extended_clicked), editor); diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c index e991cfa156..d874fe16eb 100644 --- a/app/widgets/gimpeditor.c +++ b/app/widgets/gimpeditor.c @@ -283,7 +283,7 @@ GtkWidget * gimp_editor_add_button (GimpEditor *editor, const gchar *stock_id, const gchar *tooltip, - const gchar *help_data, + const gchar *help_id, GCallback callback, GCallback extended_callback, gpointer callback_data) @@ -301,8 +301,8 @@ gimp_editor_add_button (GimpEditor *editor, gtk_box_pack_start (GTK_BOX (editor->button_box), button, TRUE, TRUE, 0); gtk_widget_show (button); - if (tooltip || help_data) - gimp_help_set_help_data (button, tooltip, help_data); + if (tooltip || help_id) + gimp_help_set_help_data (button, tooltip, help_id); if (callback) g_signal_connect (button, "clicked", diff --git a/app/widgets/gimpeditor.h b/app/widgets/gimpeditor.h index 4c1c103610..67312f4cbc 100644 --- a/app/widgets/gimpeditor.h +++ b/app/widgets/gimpeditor.h @@ -65,7 +65,7 @@ void gimp_editor_create_menu (GimpEditor *editor, GtkWidget * gimp_editor_add_button (GimpEditor *editor, const gchar *stock_id, const gchar *tooltip, - const gchar *help_data, + const gchar *help_id, GCallback callback, GCallback extended_callback, gpointer callback_data); diff --git a/app/widgets/gimperrorconsole.c b/app/widgets/gimperrorconsole.c index 2cdb53ed60..c86ca322d2 100644 --- a/app/widgets/gimperrorconsole.c +++ b/app/widgets/gimperrorconsole.c @@ -170,8 +170,9 @@ gimp_error_console_init (GimpErrorConsole *console) console); console->clear_button = - gimp_editor_add_button (GIMP_EDITOR (console), GTK_STOCK_CLEAR, - _("Clear Errors"), NULL, + gimp_editor_add_button (GIMP_EDITOR (console), + GTK_STOCK_CLEAR, _("Clear Errors"), + GIMP_HELP_ERRORS_CLEAR, G_CALLBACK (gimp_error_console_clear_clicked), NULL, console); @@ -181,8 +182,9 @@ gimp_error_console_init (GimpErrorConsole *console) gimp_get_mod_name_shift ()); console->save_button = - gimp_editor_add_button (GIMP_EDITOR (console), GTK_STOCK_SAVE_AS, - str, NULL, + gimp_editor_add_button (GIMP_EDITOR (console), + GTK_STOCK_SAVE_AS, str, + GIMP_HELP_ERRORS_SAVE, G_CALLBACK (gimp_error_console_save_clicked), G_CALLBACK (gimp_error_console_save_ext_clicked), console); @@ -370,7 +372,7 @@ gimp_error_console_save_ext_clicked (GtkWidget *button, console); gimp_help_connect (GTK_WIDGET (filesel), gimp_standard_help_func, - GIMP_HELP_ERROR_DIALOG, NULL); + GIMP_HELP_ERRORS_DIALOG, NULL); gtk_widget_show (GTK_WIDGET (filesel)); } diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index ecf6d3aa4a..4c191dd65c 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -68,6 +68,7 @@ #include "gimpdnd.h" #include "gimpgradienteditor.h" +#include "gimphelp-ids.h" #include "gimpitemfactory.h" #include "gimppreview.h" #include "gimppreviewrenderergradient.h" @@ -365,20 +366,20 @@ gimp_gradient_editor_init (GimpGradientEditor *editor) /* +, - and Zoom Fit buttons */ gimp_editor_add_button (GIMP_EDITOR (editor), - GTK_STOCK_ZOOM_OUT, - _("Zoom Out"), NULL, + GTK_STOCK_ZOOM_OUT, _("Zoom Out"), + GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT, G_CALLBACK (gradient_editor_zoom_out_callback), NULL, editor); gimp_editor_add_button (GIMP_EDITOR (editor), - GTK_STOCK_ZOOM_IN, - _("Zoom In"), NULL, + GTK_STOCK_ZOOM_IN, _("Zoom In"), + GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN, G_CALLBACK (gradient_editor_zoom_in_callback), NULL, editor); gimp_editor_add_button (GIMP_EDITOR (editor), - GTK_STOCK_ZOOM_FIT, - _("Zoom All"), NULL, + GTK_STOCK_ZOOM_FIT, _("Zoom All"), + GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL, G_CALLBACK (gradient_editor_zoom_all_callback), NULL, editor); diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index 2687f47b68..27b421f048 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -53,25 +53,28 @@ #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 "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_SELECTION_DIALOG "dialogs/selection_editor.html" +#define GIMP_HELP_SELECTION_ALL "select/all.html" +#define GIMP_HELP_SELECTION_NONE "select/none.html" +#define GIMP_HELP_SELECTION_INVERT "select/invert.html" +#define GIMP_HELP_SELECTION_FLOAT "select/float.html" +#define GIMP_HELP_SELECTION_FEATHER "dialogs/feather_selection.html" +#define GIMP_HELP_SELECTION_SHARPEN "select/sharpen.html" +#define GIMP_HELP_SELECTION_SHRINK "dialogs/shrink_selection.html" +#define GIMP_HELP_SELECTION_GROW "dialogs/grow_selection.html" +#define GIMP_HELP_SELECTION_BORDER "dialogs/border_selection.html" +#define GIMP_HELP_SELECTION_STROKE "edit/stroke.html" +#define GIMP_HELP_SELECTION_TO_CHANNEL "select/save_to_channel.html" +#define GIMP_HELP_SELECTION_TO_PATH "select/to_path.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_ZOOM_OUT "view/zoom.html" +#define GIMP_HELP_VIEW_ZOOM_IN "view/zoom.html" +#define GIMP_HELP_VIEW_ZOOM_100 "view/zoom.html" +#define GIMP_HELP_VIEW_ZOOM_FIT "view/zoom.html" +#define GIMP_HELP_VIEW_ZOOM_OTHER "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" @@ -114,8 +117,8 @@ #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 "layers/stack/stack.html#lower_layer" #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" @@ -147,7 +150,9 @@ #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_RAISE_TO_TOP "channels/raise_channel.html" #define GIMP_HELP_CHANNEL_LOWER "channels/lower_channel.html" +#define GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM "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" @@ -163,7 +168,9 @@ #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_RAISE_TO_TOP "paths/raise_path.html" #define GIMP_HELP_PATH_LOWER "paths/lower_path.html" +#define GIMP_HELP_PATH_LOWER_TO_BOTTOM "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" @@ -232,6 +239,8 @@ #define GIMP_HELP_BRUSH_DELETE "dialogs/brush_selection.html" #define GIMP_HELP_BRUSH_REFRESH "dialogs/brush_selection.html" +#define GIMP_HELP_BRUSH_EDITOR_DIALOG "dialogs/brush_editor.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" @@ -247,6 +256,28 @@ #define GIMP_HELP_GRADIENT_REFRESH "dialogs/gradient_selection.html" #define GIMP_HELP_GRADIENT_SAVE_AS_POV "dialogs/gradient_selection.html" +#define GIMP_HELP_GRADIENT_EDITOR_DIALOG "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_LEFT_SAVE "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_RIGHT_SAVE "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_BLENDING "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_COLORING "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_FLIP "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_REPLICATE "dialogs/gradient_editor/replicate_segment.html" +#define GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM "dialogs/gradient_editor/split_segments_uniformly.html" +#define GIMP_HELP_GRADIENT_EDITOR_DELETE "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_RECENTER "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN "dialogs/gradient_editor/gradient_editor.html" +#define GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL "dialogs/gradient_editor/gradient_editor.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" @@ -266,6 +297,11 @@ #define GIMP_HELP_BUFFER_PASTE_AS_NEW "dialogs/paste_named.html" #define GIMP_HELP_BUFFER_DELETE "dialogs/delete_buffer.html" +#define GIMP_HELP_DOCUMENT_DIALOG "dialogs/document_index.html" +#define GIMP_HELP_DOCUMENT_OPEN "dialogs/document_index.html" +#define GIMP_HELP_DOCUMENT_REMOVE "dialogs/document_index.html" +#define GIMP_HELP_DOCUMENT_REFRESH "dialogs/document_index.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" @@ -273,6 +309,13 @@ #define GIMP_HELP_TEMPLATE_IMAGE_NEW "dialogs/templates.html" #define GIMP_HELP_TEMPLATE_DELETE "dialogs/templates.html" +#define GIMP_HELP_TOOL_OPTIONS_DIALOG "dialogs/tool_options.html" +#define GIMP_HELP_TOOL_OPTIONS_RESET "dialogs/tool_options.html" + +#define GIMP_HELP_ERRORS_DIALOG "dialogs/error_console.html" +#define GIMP_HELP_ERRORS_CLEAR "dialogs/error_console.html" +#define GIMP_HELP_ERRORS_SAVE "dialogs/error_console.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" @@ -298,16 +341,13 @@ #define GIMP_HELP_PREFS_FOLDERS_THEMES "dialogs/preferences/folders.html#themes" #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" diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index 7dfec7ae4d..4f7a7f0162 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -220,13 +220,21 @@ gimp_item_tree_view_class_init (GimpItemTreeViewClass *klass) klass->convert_item = NULL; klass->new_desc = NULL; + klass->new_help_id = NULL; klass->duplicate_desc = NULL; + klass->duplicate_help_id = NULL; klass->edit_desc = NULL; + klass->edit_help_id = NULL; klass->delete_desc = NULL; + klass->delete_help_id = NULL; klass->raise_desc = NULL; + klass->raise_help_id = NULL; klass->raise_to_top_desc = NULL; + klass->raise_to_top_help_id = NULL; klass->lower_desc = NULL; + klass->lower_help_id = NULL; klass->lower_to_bottom_desc = NULL; + klass->lower_to_bottom_help_id = NULL; } static void @@ -249,7 +257,8 @@ gimp_item_tree_view_init (GimpItemTreeView *view, view->new_button = gimp_editor_add_button (editor, - GTK_STOCK_NEW, view_class->new_desc, NULL, + GTK_STOCK_NEW, view_class->new_desc, + view_class->new_help_id, G_CALLBACK (gimp_item_tree_view_new_clicked), NULL, view); @@ -261,7 +270,7 @@ gimp_item_tree_view_init (GimpItemTreeView *view, view->raise_button = gimp_editor_add_button (editor, - GTK_STOCK_GO_UP, str, NULL, + GTK_STOCK_GO_UP, str, view_class->raise_help_id, G_CALLBACK (gimp_item_tree_view_raise_clicked), G_CALLBACK (gimp_item_tree_view_raise_extended_clicked), view); @@ -275,7 +284,7 @@ gimp_item_tree_view_init (GimpItemTreeView *view, view->lower_button = gimp_editor_add_button (editor, - GTK_STOCK_GO_DOWN, str, NULL, + GTK_STOCK_GO_DOWN, str, view_class->lower_help_id, G_CALLBACK (gimp_item_tree_view_lower_clicked), G_CALLBACK (gimp_item_tree_view_lower_extended_clicked), view); @@ -285,21 +294,23 @@ gimp_item_tree_view_init (GimpItemTreeView *view, view->duplicate_button = gimp_editor_add_button (editor, GIMP_STOCK_DUPLICATE, view_class->duplicate_desc, - NULL, + view_class->duplicate_help_id, G_CALLBACK (gimp_item_tree_view_duplicate_clicked), NULL, view); view->edit_button = gimp_editor_add_button (editor, - GIMP_STOCK_EDIT, view_class->edit_desc, NULL, + GIMP_STOCK_EDIT, view_class->edit_desc, + view_class->edit_help_id, G_CALLBACK (gimp_item_tree_view_edit_clicked), NULL, view); view->delete_button = gimp_editor_add_button (editor, - GTK_STOCK_DELETE, view_class->delete_desc, NULL, + GTK_STOCK_DELETE, view_class->delete_desc, + view_class->delete_help_id, G_CALLBACK (gimp_item_tree_view_delete_clicked), NULL, view); diff --git a/app/widgets/gimpitemtreeview.h b/app/widgets/gimpitemtreeview.h index b8b15f381e..e4949d094e 100644 --- a/app/widgets/gimpitemtreeview.h +++ b/app/widgets/gimpitemtreeview.h @@ -106,13 +106,21 @@ struct _GimpItemTreeViewClass /* various descriptive strings for tooltips and undo steps */ const gchar *new_desc; + const gchar *new_help_id; const gchar *duplicate_desc; + const gchar *duplicate_help_id; const gchar *edit_desc; + const gchar *edit_help_id; const gchar *delete_desc; + const gchar *delete_help_id; const gchar *raise_desc; + const gchar *raise_help_id; const gchar *raise_to_top_desc; + const gchar *raise_to_top_help_id; const gchar *lower_desc; + const gchar *lower_help_id; const gchar *lower_to_bottom_desc; + const gchar *lower_to_bottom_help_id; const gchar *reorder_desc; }; diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 698c53ab79..78cb2d97d7 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -40,6 +40,7 @@ #include "gimpcellrenderertoggle.h" #include "gimpcellrendererviewable.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimplayertreeview.h" #include "gimppreviewrenderer.h" #include "gimpwidgets-constructors.h" @@ -194,15 +195,23 @@ gimp_layer_tree_view_class_init (GimpLayerTreeViewClass *klass) item_view_class->remove_item = gimp_layer_tree_view_remove_item; item_view_class->convert_item = (GimpConvertItemFunc) gimp_layer_new_from_drawable; - item_view_class->new_desc = _("New Layer"); - item_view_class->duplicate_desc = _("Duplicate Layer"); - item_view_class->edit_desc = _("Edit Layer Attributes"); - item_view_class->delete_desc = _("Delete Layer"); - item_view_class->raise_desc = _("Raise Layer"); - item_view_class->raise_to_top_desc = _("Raise Layer to Top"); - item_view_class->lower_desc = _("Lower Layer"); - item_view_class->lower_to_bottom_desc = _("Lower Layer to Bottom"); - item_view_class->reorder_desc = _("Reorder Layer"); + item_view_class->new_desc = _("New Layer"); + item_view_class->new_help_id = GIMP_HELP_LAYER_NEW; + item_view_class->duplicate_desc = _("Duplicate Layer"); + item_view_class->duplicate_help_id = GIMP_HELP_LAYER_DUPLICATE; + item_view_class->edit_desc = _("Edit Layer Attributes"); + item_view_class->edit_help_id = GIMP_HELP_LAYER_EDIT; + item_view_class->delete_desc = _("Delete Layer"); + item_view_class->delete_help_id = GIMP_HELP_LAYER_DELETE; + item_view_class->raise_desc = _("Raise Layer"); + item_view_class->raise_help_id = GIMP_HELP_LAYER_RAISE; + item_view_class->raise_to_top_desc = _("Raise Layer to Top"); + item_view_class->raise_to_top_help_id = GIMP_HELP_LAYER_RAISE_TO_TOP; + item_view_class->lower_desc = _("Lower Layer"); + item_view_class->lower_help_id = GIMP_HELP_LAYER_LOWER; + item_view_class->lower_to_bottom_desc = _("Lower Layer to Bottom"); + item_view_class->lower_to_bottom_help_id = GIMP_HELP_LAYER_LOWER_TO_BOTTOM; + item_view_class->reorder_desc = _("Reorder Layer"); gimp_rgba_set (&black_color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE); gimp_rgba_set (&white_color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE); @@ -245,7 +254,7 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) gtk_box_pack_start (GTK_BOX (hbox), view->paint_mode_menu, FALSE, FALSE, 0); gtk_widget_show (view->paint_mode_menu); - gimp_help_set_help_data (view->paint_mode_menu, + gimp_help_set_help_data (view->paint_mode_menu, NULL, "#paint_mode_menu"); /* Preserve transparency toggle */ @@ -287,7 +296,8 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) view->anchor_button = gimp_editor_add_button (GIMP_EDITOR (view), - GIMP_STOCK_ANCHOR, _("Anchor Floating Layer"), NULL, + GIMP_STOCK_ANCHOR, _("Anchor Floating Layer"), + GIMP_HELP_LAYER_ANCHOR, G_CALLBACK (gimp_layer_tree_view_anchor_clicked), NULL, view); diff --git a/app/widgets/gimpselectioneditor.c b/app/widgets/gimpselectioneditor.c index 9be9f68b5c..1b02954d13 100644 --- a/app/widgets/gimpselectioneditor.c +++ b/app/widgets/gimpselectioneditor.c @@ -49,6 +49,7 @@ #include "gimpselectioneditor.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimppreview.h" #include "gimppreviewrenderer.h" #include "gimpwidgets-utils.h" @@ -165,24 +166,24 @@ gimp_selection_editor_init (GimpSelectionEditor *selection_editor) selection_editor->all_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), - GIMP_STOCK_SELECTION_ALL, - _("Select All"), NULL, + GIMP_STOCK_SELECTION_ALL, _("Select All"), + GIMP_HELP_SELECTION_ALL, G_CALLBACK (gimp_selection_editor_all_clicked), NULL, selection_editor); selection_editor->none_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), - GIMP_STOCK_SELECTION_NONE, - _("Select None"), NULL, + GIMP_STOCK_SELECTION_NONE, _("Select None"), + GIMP_HELP_SELECTION_NONE, G_CALLBACK (gimp_selection_editor_none_clicked), NULL, selection_editor); selection_editor->invert_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), - GIMP_STOCK_INVERT, - _("Invert Selection"), NULL, + GIMP_STOCK_INVERT, _("Invert Selection"), + GIMP_HELP_SELECTION_INVERT, G_CALLBACK (gimp_selection_editor_invert_clicked), NULL, selection_editor); @@ -190,7 +191,8 @@ gimp_selection_editor_init (GimpSelectionEditor *selection_editor) selection_editor->save_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), GIMP_STOCK_SELECTION_TO_CHANNEL, - _("Save Selection to Channel"), NULL, + _("Save Selection to Channel"), + GIMP_HELP_SELECTION_TO_CHANNEL, G_CALLBACK (gimp_selection_editor_save_clicked), NULL, selection_editor); @@ -201,8 +203,8 @@ gimp_selection_editor_init (GimpSelectionEditor *selection_editor) selection_editor->path_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), - GIMP_STOCK_SELECTION_TO_PATH, - str, NULL, + GIMP_STOCK_SELECTION_TO_PATH, str, + GIMP_HELP_SELECTION_TO_PATH, G_CALLBACK (gimp_selection_editor_path_clicked), G_CALLBACK (gimp_selection_editor_path_extended_clicked), selection_editor); @@ -212,7 +214,8 @@ gimp_selection_editor_init (GimpSelectionEditor *selection_editor) selection_editor->stroke_button = gimp_editor_add_button (GIMP_EDITOR (selection_editor), GIMP_STOCK_SELECTION_STROKE, - _("Stroke Selection"), NULL, + _("Stroke Selection"), + GIMP_HELP_SELECTION_STROKE, G_CALLBACK (gimp_selection_editor_stroke_clicked), NULL, selection_editor); diff --git a/app/widgets/gimptemplateview.c b/app/widgets/gimptemplateview.c index 6b4d75b01a..3acd66a094 100644 --- a/app/widgets/gimptemplateview.c +++ b/app/widgets/gimptemplateview.c @@ -41,6 +41,7 @@ #include "gimpcontainertreeview.h" #include "gimptemplateview.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimppreviewrenderer.h" #include "gimp-intl.h" @@ -169,7 +170,8 @@ gimp_template_view_new (GimpViewType view_type, template_view->new_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), GTK_STOCK_NEW, - _("Create a new template"), NULL, + _("Create a new template"), + GIMP_HELP_TEMPLATE_NEW, G_CALLBACK (gimp_template_view_new_clicked), NULL, editor); @@ -177,7 +179,8 @@ gimp_template_view_new (GimpViewType view_type, template_view->duplicate_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), GIMP_STOCK_DUPLICATE, - _("Duplicate the selected template"), NULL, + _("Duplicate the selected template"), + GIMP_HELP_TEMPLATE_DUPLICATE, G_CALLBACK (gimp_template_view_duplicate_clicked), NULL, editor); @@ -185,7 +188,8 @@ gimp_template_view_new (GimpViewType view_type, template_view->edit_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), GIMP_STOCK_EDIT, - _("Edit the selected template"), NULL, + _("Edit the selected template"), + GIMP_HELP_TEMPLATE_EDIT, G_CALLBACK (gimp_template_view_edit_clicked), NULL, editor); @@ -194,7 +198,7 @@ gimp_template_view_new (GimpViewType view_type, gimp_editor_add_button (GIMP_EDITOR (editor->view), GIMP_STOCK_IMAGE, _("Create a new image from the selected template"), - NULL, + GIMP_HELP_TEMPLATE_IMAGE_NEW, G_CALLBACK (gimp_template_view_create_clicked), NULL, editor); @@ -202,7 +206,8 @@ gimp_template_view_new (GimpViewType view_type, template_view->delete_button = gimp_editor_add_button (GIMP_EDITOR (editor->view), GTK_STOCK_DELETE, - _("Delete the selected template"), NULL, + _("Delete the selected template"), + GIMP_HELP_TEMPLATE_DELETE, G_CALLBACK (gimp_template_view_delete_clicked), NULL, editor); diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c index be102d96f8..1cc7a0d934 100644 --- a/app/widgets/gimptooloptionseditor.c +++ b/app/widgets/gimptooloptionseditor.c @@ -31,6 +31,7 @@ #include "widgets/gimpdnd.h" #include "widgets/gimpeditor.h" +#include "widgets/gimphelp-ids.h" #include "tool-options-dialog.h" @@ -115,7 +116,7 @@ tool_options_dialog_create (Gimp *gimp) gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_RESET, _("Reset to factory defaults"), - NULL, + GIMP_HELP_TOOL_OPTIONS_RESET, G_CALLBACK (tool_options_dialog_reset_callback), NULL, user_context); diff --git a/app/widgets/gimpundoeditor.c b/app/widgets/gimpundoeditor.c index 8dcacf768d..a99f81679d 100644 --- a/app/widgets/gimpundoeditor.c +++ b/app/widgets/gimpundoeditor.c @@ -31,6 +31,7 @@ #include "core/gimpundostack.h" #include "gimpcontainertreeview.h" +#include "gimphelp-ids.h" #include "gimpundoeditor.h" #include "gimp-intl.h" @@ -118,16 +119,16 @@ gimp_undo_editor_init (GimpUndoEditor *undo_editor) undo_editor->undo_button = gimp_editor_add_button (GIMP_EDITOR (undo_editor), - GTK_STOCK_UNDO, - _("Undo"), NULL, + GTK_STOCK_UNDO, _("Undo"), + GIMP_HELP_EDIT_UNDO, G_CALLBACK (gimp_undo_editor_undo_clicked), NULL, undo_editor); undo_editor->redo_button = gimp_editor_add_button (GIMP_EDITOR (undo_editor), - GTK_STOCK_REDO, - _("Redo"), NULL, + GTK_STOCK_REDO, _("Redo"), + GIMP_HELP_EDIT_REDO, G_CALLBACK (gimp_undo_editor_redo_clicked), NULL, undo_editor); diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c index 555b1941b8..52098ebc78 100644 --- a/app/widgets/gimpvectorstreeview.c +++ b/app/widgets/gimpvectorstreeview.c @@ -37,6 +37,7 @@ #include "gimpvectorstreeview.h" #include "gimpdnd.h" +#include "gimphelp-ids.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -120,15 +121,23 @@ gimp_vectors_tree_view_class_init (GimpVectorsTreeViewClass *klass) item_view_class->remove_item = (GimpRemoveItemFunc) gimp_image_remove_vectors; item_view_class->convert_item = (GimpConvertItemFunc) gimp_vectors_convert; - item_view_class->new_desc = _("New Path"); - item_view_class->duplicate_desc = _("Duplicate Path"); - item_view_class->edit_desc = _("Edit Path Attributes"); - item_view_class->delete_desc = _("Delete Path"); - item_view_class->raise_desc = _("Raise Path"); - item_view_class->raise_to_top_desc = _("Raise Path to Top"); - item_view_class->lower_desc = _("Lower Path"); - item_view_class->lower_to_bottom_desc = _("Lower Path to Bottom"); - item_view_class->reorder_desc = _("Reorder Path"); + item_view_class->new_desc = _("New Path"); + item_view_class->new_help_id = GIMP_HELP_PATH_NEW; + item_view_class->duplicate_desc = _("Duplicate Path"); + item_view_class->duplicate_help_id = GIMP_HELP_PATH_DUPLICATE; + item_view_class->edit_desc = _("Edit Path Attributes"); + item_view_class->edit_help_id = GIMP_HELP_PATH_EDIT; + item_view_class->delete_desc = _("Delete Path"); + item_view_class->delete_help_id = GIMP_HELP_PATH_DELETE; + item_view_class->raise_desc = _("Raise Path"); + item_view_class->raise_help_id = GIMP_HELP_PATH_RAISE; + item_view_class->raise_to_top_desc = _("Raise Path to Top"); + item_view_class->raise_to_top_help_id = GIMP_HELP_PATH_RAISE_TO_TOP; + item_view_class->lower_desc = _("Lower Path"); + item_view_class->lower_help_id = GIMP_HELP_PATH_LOWER; + item_view_class->lower_to_bottom_desc = _("Lower Path to Bottom"); + item_view_class->lower_to_bottom_help_id = GIMP_HELP_PATH_LOWER_TO_BOTTOM; + item_view_class->reorder_desc = _("Reorder Path"); } static void @@ -151,7 +160,8 @@ gimp_vectors_tree_view_init (GimpVectorsTreeView *view) view->toselection_button = gimp_editor_add_button (editor, - GIMP_STOCK_SELECTION_REPLACE, str, NULL, + GIMP_STOCK_SELECTION_REPLACE, str, + GIMP_HELP_PATH_SELECTION_REPLACE, G_CALLBACK (gimp_vectors_tree_view_toselection_clicked), G_CALLBACK (gimp_vectors_tree_view_toselection_extended_clicked), view); @@ -164,7 +174,8 @@ gimp_vectors_tree_view_init (GimpVectorsTreeView *view) view->tovectors_button = gimp_editor_add_button (editor, - GIMP_STOCK_SELECTION_TO_PATH, str, NULL, + GIMP_STOCK_SELECTION_TO_PATH, str, + GIMP_HELP_SELECTION_TO_PATH, G_CALLBACK (gimp_vectors_tree_view_tovectors_clicked), G_CALLBACK (gimp_vectors_tree_view_tovectors_extended_clicked), view); @@ -173,7 +184,8 @@ gimp_vectors_tree_view_init (GimpVectorsTreeView *view) view->stroke_button = gimp_editor_add_button (editor, - GIMP_STOCK_PATH_STROKE, _("Stroke Path"), NULL, + GIMP_STOCK_PATH_STROKE, _("Stroke Path"), + GIMP_HELP_PATH_STROKE, G_CALLBACK (gimp_vectors_tree_view_stroke_clicked), NULL, view);