dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/display/gimpdisplayshell.c app/gui/brush-select.c 

2003-08-22  Michael Natterer  <mitch@gimp.org>

	* 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.
This commit is contained in:
Michael Natterer 2003-08-22 01:42:57 +00:00 committed by Michael Natterer
parent 37e2d34afe
commit fc20b3ac55
83 changed files with 801 additions and 625 deletions

32
ChangeLog
View File

@ -1,3 +1,35 @@
2003-08-22 Michael Natterer <mitch@gimp.org>
* 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 <sven@gimp.org> 2003-08-22 Sven Neumann <sven@gimp.org>
* tools/gimpblendtool.c * tools/gimpblendtool.c

11
app/actions/image-commands.c
View File

@ -37,6 +37,7 @@
#include "core/gimpimage-scale.h" #include "core/gimpimage-scale.h"
#include "core/gimpimage-undo.h" #include "core/gimpimage-undo.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -378,7 +379,7 @@ image_layers_merge_query (GimpImage *gimage,
GIMP_STOCK_MERGE_DOWN, GIMP_STOCK_MERGE_DOWN,
_("Layers Merge Options"), _("Layers Merge Options"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/layers/merge_visible_layers.html", GIMP_HELP_IMAGE_MERGE_LAYERS,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,
@ -442,7 +443,7 @@ image_resize_callback (GtkWidget *widget,
gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE); gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE);
if (image_resize->resize->width > 0 && if (image_resize->resize->width > 0 &&
image_resize->resize->height > 0) image_resize->resize->height > 0)
{ {
GimpProgress *progress; GimpProgress *progress;
@ -461,7 +462,7 @@ image_resize_callback (GtkWidget *widget,
gimp_image_flush (image_resize->gimage); gimp_image_flush (image_resize->gimage);
} }
else else
{ {
g_message (_("Resize Error: Both width and height must be " g_message (_("Resize Error: Both width and height must be "
"greater than zero.")); "greater than zero."));
@ -498,7 +499,7 @@ image_scale_callback (GtkWidget *widget,
dialog = dialog =
gimp_query_boolean_box (_("Layer Too Small"), gimp_query_boolean_box (_("Layer Too Small"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/scale_layer_warn.html", GIMP_HELP_IMAGE_SCALE_WARNING,
GTK_STOCK_DIALOG_QUESTION, GTK_STOCK_DIALOG_QUESTION,
_("The chosen image size will shrink\n" _("The chosen image size will shrink\n"
"some layers completely away.\n" "some layers completely away.\n"
@ -562,7 +563,7 @@ image_scale_implement (ImageResize *image_scale)
image_scale->resize->height != gimage->height) image_scale->resize->height != gimage->height)
{ {
if (image_scale->resize->width > 0 && if (image_scale->resize->width > 0 &&
image_scale->resize->height > 0) image_scale->resize->height > 0)
{ {
GimpProgress *progress; GimpProgress *progress;

3
app/actions/palettes-commands.c
View File

@ -30,6 +30,7 @@
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpdatafactoryview.h" #include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h" #include "widgets/gimppreview.h"
#include "palette-import-dialog.h" #include "palette-import-dialog.h"
@ -80,7 +81,7 @@ palettes_merge_palettes_query (GimpContainerEditor *editor)
qbox = gimp_query_string_box (_("Merge Palette"), qbox = gimp_query_string_box (_("Merge Palette"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/palette_editor/merge_palette.html", GIMP_HELP_PALETTE_MERGE,
_("Enter a name for merged palette"), _("Enter a name for merged palette"),
NULL, NULL,
G_OBJECT (editor), "destroy", G_OBJECT (editor), "destroy",

21
app/actions/qmask-commands.c
View File

@ -31,6 +31,7 @@
#include "core/gimpimage-qmask.h" #include "core/gimpimage-qmask.h"
#include "widgets/gimpcolorpanel.h" #include "widgets/gimpcolorpanel.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -56,7 +57,7 @@ struct _EditQmaskOptions
/* local function prototypes */ /* local function prototypes */
static void qmask_channel_query (GimpDisplayShell *shell); 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); gpointer client_data);
static void qmask_query_scale_update (GtkAdjustment *adjustment, static void qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data); gpointer data);
@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell)
options->gimage = shell->gdisp->gimage; options->gimage = shell->gdisp->gimage;
options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"),
&options->gimage->qmask_color, &options->gimage->qmask_color,
GIMP_COLOR_AREA_LARGE_CHECKS, GIMP_COLOR_AREA_LARGE_CHECKS,
48, 64); 48, 64);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel),
gimp_get_user_context (options->gimage->gimp)); gimp_get_user_context (options->gimage->gimp));
@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell)
GIMP_STOCK_QMASK_ON, GIMP_STOCK_QMASK_ON,
_("Edit QuickMask Attributes"), _("Edit QuickMask Attributes"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/edit_qmask_attributes.html", GIMP_HELP_QMASK_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,
@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell)
/* The opacity scale */ /* The opacity scale */
opacity_scale_data = 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); 0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_size_request (opacity_scale, 100, -1); 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_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed), G_CALLBACK (qmask_query_color_changed),
opacity_scale_data); opacity_scale_data);
gtk_widget_show (options->query_box); gtk_widget_show (options->query_box);
} }
static void static void
qmask_query_ok_callback (GtkWidget *widget, qmask_query_ok_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
EditQmaskOptions *options; EditQmaskOptions *options;
GimpChannel *channel; GimpChannel *channel;
@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget,
gtk_widget_destroy (options->query_box); gtk_widget_destroy (options->query_box);
} }
static void static void
qmask_query_scale_update (GtkAdjustment *adjustment, qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data) gpointer data)
{ {
GimpRGB color; GimpRGB color;

21
app/actions/quick-mask-commands.c
View File

@ -31,6 +31,7 @@
#include "core/gimpimage-qmask.h" #include "core/gimpimage-qmask.h"
#include "widgets/gimpcolorpanel.h" #include "widgets/gimpcolorpanel.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -56,7 +57,7 @@ struct _EditQmaskOptions
/* local function prototypes */ /* local function prototypes */
static void qmask_channel_query (GimpDisplayShell *shell); 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); gpointer client_data);
static void qmask_query_scale_update (GtkAdjustment *adjustment, static void qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data); gpointer data);
@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell)
options->gimage = shell->gdisp->gimage; options->gimage = shell->gdisp->gimage;
options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"),
&options->gimage->qmask_color, &options->gimage->qmask_color,
GIMP_COLOR_AREA_LARGE_CHECKS, GIMP_COLOR_AREA_LARGE_CHECKS,
48, 64); 48, 64);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel),
gimp_get_user_context (options->gimage->gimp)); gimp_get_user_context (options->gimage->gimp));
@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell)
GIMP_STOCK_QMASK_ON, GIMP_STOCK_QMASK_ON,
_("Edit QuickMask Attributes"), _("Edit QuickMask Attributes"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/edit_qmask_attributes.html", GIMP_HELP_QMASK_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,
@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell)
/* The opacity scale */ /* The opacity scale */
opacity_scale_data = 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); 0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_size_request (opacity_scale, 100, -1); 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_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed), G_CALLBACK (qmask_query_color_changed),
opacity_scale_data); opacity_scale_data);
gtk_widget_show (options->query_box); gtk_widget_show (options->query_box);
} }
static void static void
qmask_query_ok_callback (GtkWidget *widget, qmask_query_ok_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
EditQmaskOptions *options; EditQmaskOptions *options;
GimpChannel *channel; GimpChannel *channel;
@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget,
gtk_widget_destroy (options->query_box); gtk_widget_destroy (options->query_box);
} }
static void static void
qmask_query_scale_update (GtkAdjustment *adjustment, qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data) gpointer data)
{ {
GimpRGB color; GimpRGB color;

5
app/actions/templates-commands.c
View File

@ -32,6 +32,7 @@
#include "core/gimptemplate.h" #include "core/gimptemplate.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimptemplateeditor.h" #include "widgets/gimptemplateeditor.h"
#include "widgets/gimptemplateview.h" #include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
@ -133,7 +134,7 @@ templates_new_template_dialog (Gimp *gimp,
GIMP_STOCK_TEMPLATE, GIMP_STOCK_TEMPLATE,
_("Create a New Template"), _("Create a New Template"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/new_template.html", GIMP_HELP_TEMPLATE_NEW,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE, NULL, (gpointer) 1, NULL, FALSE, TRUE,
@ -202,7 +203,7 @@ templates_edit_template_dialog (Gimp *gimp,
GIMP_STOCK_EDIT, GIMP_STOCK_EDIT,
_("Edit Template"), _("Edit Template"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/edit_template.html", GIMP_HELP_TEMPLATE_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE, NULL, (gpointer) 1, NULL, FALSE, TRUE,

3
app/dialogs/convert-dialog.c
View File

@ -32,6 +32,7 @@
#include "core/gimppalette.h" #include "core/gimppalette.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "palette-select.h" #include "palette-select.h"
@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage)
GIMP_STOCK_CONVERT_INDEXED, GIMP_STOCK_CONVERT_INDEXED,
_("Convert Image to Indexed Colors"), _("Convert Image to Indexed Colors"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/convert_to_indexed.html", GIMP_HELP_IMAGE_CONVERT_INDEXED,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,

3
app/dialogs/palette-import-dialog.c
View File

@ -39,6 +39,7 @@
#include "widgets/gimpcontainermenuimpl.h" #include "widgets/gimpcontainermenuimpl.h"
#include "widgets/gimpdnd.h" #include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h" #include "widgets/gimppreview.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
@ -167,7 +168,7 @@ palette_import_dialog_new (Gimp *gimp)
GTK_STOCK_CONVERT, GTK_STOCK_CONVERT,
_("Import a New Palette"), _("Import a New Palette"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/palette_editor/import_palette.html", GIMP_HELP_PALETTE_IMPORT,
GTK_STOCK_CANCEL, palette_import_close_callback, GTK_STOCK_CANCEL, palette_import_close_callback,
import_dialog, NULL, NULL, FALSE, TRUE, import_dialog, NULL, NULL, FALSE, TRUE,

47
app/dialogs/preferences-dialog.c
View File

@ -39,6 +39,7 @@
#include "widgets/gimpdeviceinfo.h" #include "widgets/gimpdeviceinfo.h"
#include "widgets/gimpdevices.h" #include "widgets/gimpdevices.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -893,7 +894,7 @@ prefs_dialog_new (Gimp *gimp,
dialog = gimp_dialog_new (_("Preferences"), "preferences", dialog = gimp_dialog_new (_("Preferences"), "preferences",
prefs_help_func, prefs_help_func,
"dialogs/preferences/preferences.html", GIMP_HELP_PREFS_DIALOG,
GTK_WIN_POS_NONE, GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -1015,7 +1016,7 @@ prefs_dialog_new (Gimp *gimp,
"new-image.png", "new-image.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("New Image"), _("New Image"),
"dialogs/preferences/new_file.html", GIMP_HELP_PREFS_NEW_IMAGE,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1112,7 +1113,7 @@ prefs_dialog_new (Gimp *gimp,
"default-comment.png", "default-comment.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Default Comment"), _("Default Comment"),
"dialogs/preferences/new_file.html#default_comment", GIMP_HELP_PREFS_NEW_IMAGE_COMMENT,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1149,7 +1150,7 @@ prefs_dialog_new (Gimp *gimp,
"interface.png", "interface.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Interface"), _("Interface"),
"dialogs/preferences/interface.html", GIMP_HELP_PREFS_INTERFACE,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1269,7 +1270,7 @@ prefs_dialog_new (Gimp *gimp,
"help-system.png", "help-system.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Help System"), _("Help System"),
"dialogs/preferences/interface.html#help_system", GIMP_HELP_PREFS_HELP,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1305,7 +1306,7 @@ prefs_dialog_new (Gimp *gimp,
"tool-options.png", "tool-options.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Tool Options"), _("Tool Options"),
"dialogs/preferences/interface.html#tool_options", GIMP_HELP_PREFS_TOOL_OPTIONS,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1337,7 +1338,7 @@ prefs_dialog_new (Gimp *gimp,
"input-devices.png", "input-devices.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Input Devices"), _("Input Devices"),
"dialogs/preferences/input-devices.html", GIMP_HELP_PREFS_INPUT_DEVICES,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1385,7 +1386,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png", "image-windows.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Image Windows"), _("Image Windows"),
"dialogs/preferences/interface.html#image_windows", GIMP_HELP_PREFS_IMAGE_WINDOW,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1452,7 +1453,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png", "image-windows.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Appearance"), _("Appearance"),
"dialogs/preferences/image_windows.html", GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
&child_iter, &child_iter,
&grandchild_iter, &grandchild_iter,
page_index++); page_index++);
@ -1525,7 +1526,7 @@ prefs_dialog_new (Gimp *gimp,
"image-title.png", "image-title.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Title & Status"), _("Title & Status"),
"dialogs/preferences/image_windows.html", GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE,
&child_iter, &child_iter,
&grandchild_iter, &grandchild_iter,
page_index++); page_index++);
@ -1650,7 +1651,7 @@ prefs_dialog_new (Gimp *gimp,
"display.png", "display.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Display"), _("Display"),
"dialogs/preferences/display.html", GIMP_HELP_PREFS_DISPLAY,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1694,7 +1695,7 @@ prefs_dialog_new (Gimp *gimp,
"monitor.png", "monitor.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Monitor"), _("Monitor"),
"dialogs/preferences/monitor.html", GIMP_HELP_PREFS_MONITOR,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1808,7 +1809,7 @@ prefs_dialog_new (Gimp *gimp,
"environment.png", "environment.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Environment"), _("Environment"),
"dialogs/preferences/environment.html", GIMP_HELP_PREFS_ENVIRONMENT,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1866,7 +1867,7 @@ prefs_dialog_new (Gimp *gimp,
"folders.png", "folders.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Folders"), _("Folders"),
"dialogs/preferences/folders.html", GIMP_HELP_PREFS_FOLDERS,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1915,39 +1916,39 @@ prefs_dialog_new (Gimp *gimp,
paths[] = paths[] =
{ {
{ N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png",
"dialogs/preferences/folders.html#brushes", GIMP_HELP_PREFS_FOLDERS_BRUSHES,
N_("Select Brush Folders"), N_("Select Brush Folders"),
"brush-path" }, "brush-path" },
{ N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png",
"dialogs/preferences/folders.html#patterns", GIMP_HELP_PREFS_FOLDERS_PATTERNS,
N_("Select Pattern Folders"), N_("Select Pattern Folders"),
"pattern-path" }, "pattern-path" },
{ N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png",
"dialogs/preferences/folders.html#palettes", GIMP_HELP_PREFS_FOLDERS_PALETTES,
N_("Select Palette Folders"), N_("Select Palette Folders"),
"palette-path" }, "palette-path" },
{ N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",
"dialogs/preferences/folders.html#gradients", GIMP_HELP_PREFS_FOLDERS_GRADIENTS,
N_("Select Gradient Folders"), N_("Select Gradient Folders"),
"gradient-path" }, "gradient-path" },
{ N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", { 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"), N_("Select Plug-In Folders"),
"plug-in-path" }, "plug-in-path" },
{ N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png", { N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png",
"dialogs/preferences/folders.html#scripts", GIMP_HELP_PREFS_FOLDERS_SCRIPTS,
N_("Select Script-Fu Folders"), N_("Select Script-Fu Folders"),
"script-fu-path" }, "script-fu-path" },
{ N_("Modules"), N_("Module Folders"), "folders-modules.png", { N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules", GIMP_HELP_PREFS_FOLDERS_MODULES,
N_("Select Module Folders"), N_("Select Module Folders"),
"module-path" }, "module-path" },
{ N_("Environment"), N_("Environment Folders"), "folders-environ.png", { N_("Environment"), N_("Environment Folders"), "folders-environ.png",
"dialogs/preferences/folders.html#environ", GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT,
N_("Select Environment Folders"), N_("Select Environment Folders"),
"environ-path" }, "environ-path" },
{ N_("Themes"), N_("Theme Folders"), "folders-themes.png", { N_("Themes"), N_("Theme Folders"), "folders-themes.png",
"dialogs/preferences/folders.html#themes", GIMP_HELP_PREFS_FOLDERS_THEMES,
N_("Select Theme Folders"), N_("Select Theme Folders"),
"theme-path" } "theme-path" }
}; };

7
app/display/gimpdisplayshell-draw.c
View File

@ -51,6 +51,7 @@
#include "widgets/gimpcolorpanel.h" #include "widgets/gimpcolorpanel.h"
#include "widgets/gimpdnd.h" #include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell)
gimp_display_shell_drop_color, gimp_display_shell_drop_color,
shell); 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"); "image/image_window.html");
} }
@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
shell->warning_dialog = shell->warning_dialog =
gimp_query_boolean_box (title, gimp_query_boolean_box (title,
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/really_close.html", GIMP_HELP_FILE_CLOSE_CONFIRM,
GIMP_STOCK_QUESTION, GIMP_STOCK_QUESTION,
warning, warning,
GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,

7
app/display/gimpdisplayshell.c
View File

@ -51,6 +51,7 @@
#include "widgets/gimpcolorpanel.h" #include "widgets/gimpcolorpanel.h"
#include "widgets/gimpdnd.h" #include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell)
gimp_display_shell_drop_color, gimp_display_shell_drop_color,
shell); 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"); "image/image_window.html");
} }
@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
shell->warning_dialog = shell->warning_dialog =
gimp_query_boolean_box (title, gimp_query_boolean_box (title,
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/really_close.html", GIMP_HELP_FILE_CLOSE_CONFIRM,
GIMP_STOCK_QUESTION, GIMP_STOCK_QUESTION,
warning, warning,
GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,

13
app/gui/brush-select.c
View File

@ -36,8 +36,9 @@
#include "pdb/procedural_db.h" #include "pdb/procedural_db.h"
#include "widgets/gimpcontainerview.h"
#include "widgets/gimpbrushfactoryview.h" #include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpcontainerview.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-constructors.h" #include "widgets/gimpwidgets-constructors.h"
#include "brush-select.h" #include "brush-select.h"
@ -145,7 +146,7 @@ brush_select_new (Gimp *gimp,
/* The shell */ /* The shell */
bsp->shell = gimp_dialog_new (title, "brush_selection", bsp->shell = gimp_dialog_new (title, "brush_selection",
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/brush_selection.html", GIMP_HELP_BRUSH_DIALOG,
GTK_WIN_POS_MOUSE, GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -177,7 +178,7 @@ brush_select_new (Gimp *gimp,
gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2);
/* Create the opacity scale widget */ /* Create the opacity scale widget */
bsp->opacity_data = bsp->opacity_data =
GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1, GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Opacity:"), -1, 5, _("Opacity:"), -1, 5,
gimp_context_get_opacity (bsp->context) * 100.0, gimp_context_get_opacity (bsp->context) * 100.0,
@ -221,7 +222,7 @@ brush_select_free (BrushSelect *bsp)
{ {
g_return_if_fail (bsp != NULL); g_return_if_fail (bsp != NULL);
gtk_widget_destroy (bsp->shell); gtk_widget_destroy (bsp->shell);
/* remove from active list */ /* remove from active list */
brush_active_dialogs = g_slist_remove (brush_active_dialogs, bsp); brush_active_dialogs = g_slist_remove (brush_active_dialogs, bsp);
@ -298,7 +299,7 @@ brush_select_change_callbacks (BrushSelect *bsp,
if (proc && brush) if (proc && brush)
{ {
Argument *return_vals; Argument *return_vals;
gint nreturn_vals; gint nreturn_vals;
return_vals = return_vals =
@ -412,5 +413,5 @@ brush_select_close_callback (GtkWidget *widget,
BrushSelect *bsp) BrushSelect *bsp)
{ {
brush_select_change_callbacks (bsp, TRUE); brush_select_change_callbacks (bsp, TRUE);
brush_select_free (bsp); brush_select_free (bsp);
} }

8
app/gui/channels-menu.c
View File

@ -73,22 +73,22 @@ GimpItemFactoryEntry channels_menu_entries[] =
channels_selection_replace_cmd_callback, 0, channels_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_CHANNEL_SEL_REPLACE, NULL }, GIMP_HELP_CHANNEL_SELECTION_REPLACE, NULL },
{ { N_("/_Add to Selection"), NULL, { { N_("/_Add to Selection"), NULL,
channels_selection_add_cmd_callback, 0, channels_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_CHANNEL_SEL_ADD, NULL }, GIMP_HELP_CHANNEL_SELECTION_ADD, NULL },
{ { N_("/_Subtract from Selection"), NULL, { { N_("/_Subtract from Selection"), NULL,
channels_selection_sub_cmd_callback, 0, channels_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_CHANNEL_SEL_SUB, NULL }, GIMP_HELP_CHANNEL_SELECTION_SUBTRACT, NULL },
{ { N_("/_Intersect with Selection"), NULL, { { N_("/_Intersect with Selection"), NULL,
channels_selection_intersect_cmd_callback, 0, channels_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_CHANNEL_SEL_INTERSECT, NULL }, GIMP_HELP_CHANNEL_SELECTION_INTERSECT, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),

3
app/gui/convert-dialog.c
View File

@ -32,6 +32,7 @@
#include "core/gimppalette.h" #include "core/gimppalette.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "palette-select.h" #include "palette-select.h"
@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage)
GIMP_STOCK_CONVERT_INDEXED, GIMP_STOCK_CONVERT_INDEXED,
_("Convert Image to Indexed Colors"), _("Convert Image to Indexed Colors"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/convert_to_indexed.html", GIMP_HELP_IMAGE_CONVERT_INDEXED,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,

5
app/gui/file-open-menu.c
View File

@ -30,6 +30,7 @@
#include "plug-in/plug-in-proc.h" #include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "file-commands.h" #include "file-commands.h"
@ -44,14 +45,14 @@ GimpItemFactoryEntry file_open_menu_entries[] =
{ { N_("/Automatic"), NULL, { { N_("/Automatic"), NULL,
file_open_by_extension_cmd_callback, 0 }, file_open_by_extension_cmd_callback, 0 },
NULL, NULL,
"open_by_extension.html", NULL }, GIMP_HELP_FILE_OPEN_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---") MENU_SEPARATOR ("/---")
}; };
gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries); gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries);
void void
file_open_menu_setup (GimpItemFactory *factory) file_open_menu_setup (GimpItemFactory *factory)
{ {

3
app/gui/file-save-menu.c
View File

@ -31,6 +31,7 @@
#include "plug-in/plug-in-proc.h" #include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "file-commands.h" #include "file-commands.h"
@ -45,7 +46,7 @@ GimpItemFactoryEntry file_save_menu_entries[] =
{ { N_("/By Extension"), NULL, { { N_("/By Extension"), NULL,
file_save_by_extension_cmd_callback, 0 }, file_save_by_extension_cmd_callback, 0 },
NULL, NULL,
"save_by_extension.html", NULL }, GIMP_HELP_FILE_SAVE_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---") MENU_SEPARATOR ("/---")
}; };

13
app/gui/font-select.c
View File

@ -35,6 +35,7 @@
#include "pdb/procedural_db.h" #include "pdb/procedural_db.h"
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimphelp-ids.h"
#include "dialogs-constructors.h" #include "dialogs-constructors.h"
#include "menus.h" #include "menus.h"
@ -101,7 +102,7 @@ font_select_new (Gimp *gimp,
/* the shell */ /* the shell */
font_select->shell = gimp_dialog_new (title, "font_selection", font_select->shell = gimp_dialog_new (title, "font_selection",
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/font_selection.html", GIMP_HELP_FONT_DIALOG,
GTK_WIN_POS_MOUSE, GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -135,7 +136,7 @@ font_select_free (FontSelect *font_select)
{ {
g_return_if_fail (font_select != NULL); g_return_if_fail (font_select != NULL);
gtk_widget_destroy (font_select->shell); gtk_widget_destroy (font_select->shell);
/* remove from active list */ /* remove from active list */
font_active_dialogs = g_slist_remove (font_active_dialogs, font_select); 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, if (! procedural_db_lookup (font_select->context->gimp,
font_select->callback_name)) 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) if (proc && font)
{ {
Argument *return_vals; Argument *return_vals;
gint nreturn_vals; gint nreturn_vals;
return_vals = return_vals =
@ -225,7 +226,7 @@ font_select_change_callbacks (FontSelect *font_select,
GIMP_PDB_STRING, GIMP_OBJECT (font)->name, GIMP_PDB_STRING, GIMP_OBJECT (font)->name,
GIMP_PDB_INT32, closing, GIMP_PDB_INT32, closing,
GIMP_PDB_END); GIMP_PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS)
g_message (_("Unable to run font callback.\n" g_message (_("Unable to run font callback.\n"
"The corresponding plug-in may have crashed.")); "The corresponding plug-in may have crashed."));
@ -251,5 +252,5 @@ font_select_close_callback (GtkWidget *widget,
FontSelect *font_select) FontSelect *font_select)
{ {
font_select_change_callbacks (font_select, TRUE); font_select_change_callbacks (font_select, TRUE);
font_select_free (font_select); font_select_free (font_select);
} }

3
app/gui/gradient-select.c
View File

@ -37,6 +37,7 @@
#include "widgets/gimpcontainerview.h" #include "widgets/gimpcontainerview.h"
#include "widgets/gimpdatafactoryview.h" #include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "dialogs-constructors.h" #include "dialogs-constructors.h"
#include "gradient-select.h" #include "gradient-select.h"
@ -116,7 +117,7 @@ gradient_select_new (Gimp *gimp,
/* the shell */ /* the shell */
gsp->shell = gimp_dialog_new (title, "gradient_selection", gsp->shell = gimp_dialog_new (title, "gradient_selection",
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/gradient_selection.html", GIMP_HELP_GRADIENT_DIALOG,
GTK_WIN_POS_MOUSE, GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,

3
app/gui/gui.c
View File

@ -48,6 +48,7 @@
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimperrorconsole.h" #include "widgets/gimperrorconsole.h"
#include "widgets/gimphelp.h" #include "widgets/gimphelp.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -500,7 +501,7 @@ gui_exit_callback (Gimp *gimp,
dialog = gimp_query_boolean_box (_("Quit The GIMP?"), dialog = gimp_query_boolean_box (_("Quit The GIMP?"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/really_quit.html", GIMP_HELP_FILE_QUIT_CONFIRM,
GIMP_STOCK_WILBER_EEK, GIMP_STOCK_WILBER_EEK,
_("Some files are unsaved.\n" _("Some files are unsaved.\n"
"\nReally quit The GIMP?"), "\nReally quit The GIMP?"),

11
app/gui/image-commands.c
View File

@ -37,6 +37,7 @@
#include "core/gimpimage-scale.h" #include "core/gimpimage-scale.h"
#include "core/gimpimage-undo.h" #include "core/gimpimage-undo.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -378,7 +379,7 @@ image_layers_merge_query (GimpImage *gimage,
GIMP_STOCK_MERGE_DOWN, GIMP_STOCK_MERGE_DOWN,
_("Layers Merge Options"), _("Layers Merge Options"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/layers/merge_visible_layers.html", GIMP_HELP_IMAGE_MERGE_LAYERS,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,
@ -442,7 +443,7 @@ image_resize_callback (GtkWidget *widget,
gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE); gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE);
if (image_resize->resize->width > 0 && if (image_resize->resize->width > 0 &&
image_resize->resize->height > 0) image_resize->resize->height > 0)
{ {
GimpProgress *progress; GimpProgress *progress;
@ -461,7 +462,7 @@ image_resize_callback (GtkWidget *widget,
gimp_image_flush (image_resize->gimage); gimp_image_flush (image_resize->gimage);
} }
else else
{ {
g_message (_("Resize Error: Both width and height must be " g_message (_("Resize Error: Both width and height must be "
"greater than zero.")); "greater than zero."));
@ -498,7 +499,7 @@ image_scale_callback (GtkWidget *widget,
dialog = dialog =
gimp_query_boolean_box (_("Layer Too Small"), gimp_query_boolean_box (_("Layer Too Small"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/scale_layer_warn.html", GIMP_HELP_IMAGE_SCALE_WARNING,
GTK_STOCK_DIALOG_QUESTION, GTK_STOCK_DIALOG_QUESTION,
_("The chosen image size will shrink\n" _("The chosen image size will shrink\n"
"some layers completely away.\n" "some layers completely away.\n"
@ -562,7 +563,7 @@ image_scale_implement (ImageResize *image_scale)
image_scale->resize->height != gimage->height) image_scale->resize->height != gimage->height)
{ {
if (image_scale->resize->width > 0 && if (image_scale->resize->width > 0 &&
image_scale->resize->height > 0) image_scale->resize->height > 0)
{ {
GimpProgress *progress; GimpProgress *progress;

18
app/gui/image-menu.c
View File

@ -314,7 +314,7 @@ GimpItemFactoryEntry image_menu_entries[] =
select_toggle_quickmask_cmd_callback, 0, select_toggle_quickmask_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_QMASK_ON }, "<StockItem>", GIMP_STOCK_QMASK_ON },
NULL, NULL,
GIMP_HELP_SELECT_QUICKMASK, NULL }, GIMP_HELP_QMASK_TOGGLE, NULL },
{ { N_("/Select/Save to _Channel"), NULL, { { N_("/Select/Save to _Channel"), NULL,
select_save_cmd_callback, 0, select_save_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_TO_CHANNEL }, "<StockItem>", GIMP_STOCK_SELECTION_TO_CHANNEL },
@ -753,22 +753,22 @@ GimpItemFactoryEntry image_menu_entries[] =
layers_mask_selection_replace_cmd_callback, 0, layers_mask_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL },
{ { N_("/Layer/Mask/_Add to Selection"), NULL, { { N_("/Layer/Mask/_Add to Selection"), NULL,
layers_mask_selection_add_cmd_callback, 0, layers_mask_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_ADD, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_ADD, NULL },
{ { N_("/Layer/Mask/_Subtract from Selection"), NULL, { { N_("/Layer/Mask/_Subtract from Selection"), NULL,
layers_mask_selection_sub_cmd_callback, 0, layers_mask_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_SUB, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT, NULL },
{ { N_("/Layer/Mask/_Intersect with Selection"), NULL, { { N_("/Layer/Mask/_Intersect with Selection"), NULL,
layers_mask_selection_intersect_cmd_callback, 0, layers_mask_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_INTERSECT, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT, NULL },
/* <Image>/Layer/Transparency */ /* <Image>/Layer/Transparency */
@ -785,22 +785,22 @@ GimpItemFactoryEntry image_menu_entries[] =
layers_alpha_selection_replace_cmd_callback, 0, layers_alpha_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL },
{ { N_("/Layer/Transparency/A_dd to Selection"), NULL, { { N_("/Layer/Transparency/A_dd to Selection"), NULL,
layers_alpha_selection_add_cmd_callback, 0, layers_alpha_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_ADD, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_ADD, NULL },
{ { N_("/Layer/Transparency/_Subtract from Selection"), NULL, { { N_("/Layer/Transparency/_Subtract from Selection"), NULL,
layers_alpha_selection_sub_cmd_callback, 0, layers_alpha_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_SUB, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT, NULL },
{ { N_("/Layer/Transparency/_Intersect with Selection"), NULL, { { N_("/Layer/Transparency/_Intersect with Selection"), NULL,
layers_alpha_selection_intersect_cmd_callback, 0, layers_alpha_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT, NULL },
MENU_SEPARATOR ("/Layer/Transparency/---"), MENU_SEPARATOR ("/Layer/Transparency/---"),

4
app/gui/layers-menu.c
View File

@ -126,7 +126,7 @@ GimpItemFactoryEntry layers_menu_entries[] =
layers_mask_selection_replace_cmd_callback, 0, layers_mask_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
@ -138,7 +138,7 @@ GimpItemFactoryEntry layers_menu_entries[] =
layers_alpha_selection_replace_cmd_callback, 0, layers_alpha_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),

7
app/gui/menus.c
View File

@ -33,6 +33,7 @@
#include "file/file-utils.h" #include "file/file-utils.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
@ -297,7 +298,7 @@ menus_last_opened_add (GimpItemFactory *item_factory,
for (i = 0; i < n; i++) 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); g_strdup_printf ("/File/Open Recent/%02d", i + 1);
if (i < 9) if (i < 9)
@ -311,7 +312,7 @@ menus_last_opened_add (GimpItemFactory *item_factory,
last_opened_entries[i].entry.item_type = "<StockItem>"; last_opened_entries[i].entry.item_type = "<StockItem>";
last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN; last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN;
last_opened_entries[i].quark_string = NULL; 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; last_opened_entries[i].description = NULL;
} }
@ -371,7 +372,7 @@ menus_filters_subdirs_to_top (GtkMenu *menu)
{ {
menu_item = GTK_MENU_ITEM (list->data); menu_item = GTK_MENU_ITEM (list->data);
items++; items++;
if (menu_item->submenu) if (menu_item->submenu)
{ {
if (submenus_passed) if (submenus_passed)

3
app/gui/palette-import-dialog.c
View File

@ -39,6 +39,7 @@
#include "widgets/gimpcontainermenuimpl.h" #include "widgets/gimpcontainermenuimpl.h"
#include "widgets/gimpdnd.h" #include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h" #include "widgets/gimppreview.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
@ -167,7 +168,7 @@ palette_import_dialog_new (Gimp *gimp)
GTK_STOCK_CONVERT, GTK_STOCK_CONVERT,
_("Import a New Palette"), _("Import a New Palette"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/palette_editor/import_palette.html", GIMP_HELP_PALETTE_IMPORT,
GTK_STOCK_CANCEL, palette_import_close_callback, GTK_STOCK_CANCEL, palette_import_close_callback,
import_dialog, NULL, NULL, FALSE, TRUE, import_dialog, NULL, NULL, FALSE, TRUE,

15
app/gui/palette-select.c
View File

@ -37,6 +37,7 @@
#include "widgets/gimpcontainerview.h" #include "widgets/gimpcontainerview.h"
#include "widgets/gimpdatafactoryview.h" #include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "dialogs-constructors.h" #include "dialogs-constructors.h"
#include "menus.h" #include "menus.h"
@ -46,7 +47,7 @@
#define STD_PALETTE_COLUMNS 6 #define STD_PALETTE_COLUMNS 6
#define STD_PALETTE_ROWS 5 #define STD_PALETTE_ROWS 5
/* local function prototypes */ /* local function prototypes */
@ -118,7 +119,7 @@ palette_select_new (Gimp *gimp,
/* the shell */ /* the shell */
psp->shell = gimp_dialog_new (title, "palette_selection", psp->shell = gimp_dialog_new (title, "palette_selection",
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/palette_selection.html", GIMP_HELP_PALETTE_DIALOG,
GTK_WIN_POS_MOUSE, GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -153,7 +154,7 @@ palette_select_free (PaletteSelect *psp)
{ {
g_return_if_fail (psp != NULL); g_return_if_fail (psp != NULL);
gtk_widget_destroy (psp->shell); gtk_widget_destroy (psp->shell);
/* remove from active list */ /* remove from active list */
palette_active_dialogs = g_slist_remove (palette_active_dialogs, psp); palette_active_dialogs = g_slist_remove (palette_active_dialogs, psp);
@ -201,7 +202,7 @@ palette_select_dialogs_check (void)
if (psp->callback_name) if (psp->callback_name)
{ {
if (! procedural_db_lookup (psp->context->gimp, 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) if (proc && palette)
{ {
Argument *return_vals; Argument *return_vals;
gint nreturn_vals; gint nreturn_vals;
return_vals = return_vals =
@ -241,7 +242,7 @@ palette_select_change_callbacks (PaletteSelect *psp,
GIMP_PDB_INT32, palette->n_colors, GIMP_PDB_INT32, palette->n_colors,
GIMP_PDB_INT32, closing, GIMP_PDB_INT32, closing,
GIMP_PDB_END); GIMP_PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS)
g_message (_("Unable to run palette callback.\n" g_message (_("Unable to run palette callback.\n"
"The corresponding plug-in may have crashed.")); "The corresponding plug-in may have crashed."));
@ -267,5 +268,5 @@ palette_select_close_callback (GtkWidget *widget,
PaletteSelect *psp) PaletteSelect *psp)
{ {
palette_select_change_callbacks (psp, TRUE); palette_select_change_callbacks (psp, TRUE);
palette_select_free (psp); palette_select_free (psp);
} }

3
app/gui/palettes-commands.c
View File

@ -30,6 +30,7 @@
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpdatafactoryview.h" #include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h" #include "widgets/gimppreview.h"
#include "palette-import-dialog.h" #include "palette-import-dialog.h"
@ -80,7 +81,7 @@ palettes_merge_palettes_query (GimpContainerEditor *editor)
qbox = gimp_query_string_box (_("Merge Palette"), qbox = gimp_query_string_box (_("Merge Palette"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/palette_editor/merge_palette.html", GIMP_HELP_PALETTE_MERGE,
_("Enter a name for merged palette"), _("Enter a name for merged palette"),
NULL, NULL,
G_OBJECT (editor), "destroy", G_OBJECT (editor), "destroy",

13
app/gui/pattern-select.c
View File

@ -38,6 +38,7 @@
#include "widgets/gimpcontainerview.h" #include "widgets/gimpcontainerview.h"
#include "widgets/gimpdatafactoryview.h" #include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "menus.h" #include "menus.h"
#include "pattern-select.h" #include "pattern-select.h"
@ -114,7 +115,7 @@ pattern_select_new (Gimp *gimp,
/* the shell */ /* the shell */
psp->shell = gimp_dialog_new (title, "pattern_selection", psp->shell = gimp_dialog_new (title, "pattern_selection",
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/pattern_selection.html", GIMP_HELP_PATTERN_DIALOG,
GTK_WIN_POS_MOUSE, GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -149,7 +150,7 @@ pattern_select_free (PatternSelect *psp)
{ {
g_return_if_fail (psp != NULL); g_return_if_fail (psp != NULL);
gtk_widget_destroy (psp->shell); gtk_widget_destroy (psp->shell);
/* remove from active list */ /* remove from active list */
pattern_active_dialogs = g_slist_remove (pattern_active_dialogs, psp); pattern_active_dialogs = g_slist_remove (pattern_active_dialogs, psp);
@ -197,7 +198,7 @@ pattern_select_dialogs_check (void)
if (psp->callback_name) if (psp->callback_name)
{ {
if (! procedural_db_lookup (psp->context->gimp, 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) if (proc && pattern)
{ {
Argument *return_vals; Argument *return_vals;
gint nreturn_vals; gint nreturn_vals;
return_vals = return_vals =
@ -243,7 +244,7 @@ pattern_select_change_callbacks (PatternSelect *psp,
GIMP_PDB_INT8ARRAY, temp_buf_data (pattern->mask), GIMP_PDB_INT8ARRAY, temp_buf_data (pattern->mask),
GIMP_PDB_INT32, closing, GIMP_PDB_INT32, closing,
GIMP_PDB_END); GIMP_PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS) if (!return_vals || return_vals[0].value.pdb_int != GIMP_PDB_SUCCESS)
g_message (_("Unable to run pattern callback.\n" g_message (_("Unable to run pattern callback.\n"
"The corresponding plug-in may have crashed.")); "The corresponding plug-in may have crashed."));
@ -269,5 +270,5 @@ pattern_select_close_callback (GtkWidget *widget,
PatternSelect *psp) PatternSelect *psp)
{ {
pattern_select_change_callbacks (psp, TRUE); pattern_select_change_callbacks (psp, TRUE);
pattern_select_free (psp); pattern_select_free (psp);
} }

47
app/gui/preferences-dialog.c
View File

@ -39,6 +39,7 @@
#include "widgets/gimpdeviceinfo.h" #include "widgets/gimpdeviceinfo.h"
#include "widgets/gimpdevices.h" #include "widgets/gimpdevices.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -893,7 +894,7 @@ prefs_dialog_new (Gimp *gimp,
dialog = gimp_dialog_new (_("Preferences"), "preferences", dialog = gimp_dialog_new (_("Preferences"), "preferences",
prefs_help_func, prefs_help_func,
"dialogs/preferences/preferences.html", GIMP_HELP_PREFS_DIALOG,
GTK_WIN_POS_NONE, GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE, FALSE, TRUE, FALSE,
@ -1015,7 +1016,7 @@ prefs_dialog_new (Gimp *gimp,
"new-image.png", "new-image.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("New Image"), _("New Image"),
"dialogs/preferences/new_file.html", GIMP_HELP_PREFS_NEW_IMAGE,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1112,7 +1113,7 @@ prefs_dialog_new (Gimp *gimp,
"default-comment.png", "default-comment.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Default Comment"), _("Default Comment"),
"dialogs/preferences/new_file.html#default_comment", GIMP_HELP_PREFS_NEW_IMAGE_COMMENT,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1149,7 +1150,7 @@ prefs_dialog_new (Gimp *gimp,
"interface.png", "interface.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Interface"), _("Interface"),
"dialogs/preferences/interface.html", GIMP_HELP_PREFS_INTERFACE,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1269,7 +1270,7 @@ prefs_dialog_new (Gimp *gimp,
"help-system.png", "help-system.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Help System"), _("Help System"),
"dialogs/preferences/interface.html#help_system", GIMP_HELP_PREFS_HELP,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1305,7 +1306,7 @@ prefs_dialog_new (Gimp *gimp,
"tool-options.png", "tool-options.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Tool Options"), _("Tool Options"),
"dialogs/preferences/interface.html#tool_options", GIMP_HELP_PREFS_TOOL_OPTIONS,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1337,7 +1338,7 @@ prefs_dialog_new (Gimp *gimp,
"input-devices.png", "input-devices.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Input Devices"), _("Input Devices"),
"dialogs/preferences/input-devices.html", GIMP_HELP_PREFS_INPUT_DEVICES,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1385,7 +1386,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png", "image-windows.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Image Windows"), _("Image Windows"),
"dialogs/preferences/interface.html#image_windows", GIMP_HELP_PREFS_IMAGE_WINDOW,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1452,7 +1453,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png", "image-windows.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Appearance"), _("Appearance"),
"dialogs/preferences/image_windows.html", GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
&child_iter, &child_iter,
&grandchild_iter, &grandchild_iter,
page_index++); page_index++);
@ -1525,7 +1526,7 @@ prefs_dialog_new (Gimp *gimp,
"image-title.png", "image-title.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Title & Status"), _("Title & Status"),
"dialogs/preferences/image_windows.html", GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE,
&child_iter, &child_iter,
&grandchild_iter, &grandchild_iter,
page_index++); page_index++);
@ -1650,7 +1651,7 @@ prefs_dialog_new (Gimp *gimp,
"display.png", "display.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Display"), _("Display"),
"dialogs/preferences/display.html", GIMP_HELP_PREFS_DISPLAY,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1694,7 +1695,7 @@ prefs_dialog_new (Gimp *gimp,
"monitor.png", "monitor.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Monitor"), _("Monitor"),
"dialogs/preferences/monitor.html", GIMP_HELP_PREFS_MONITOR,
&top_iter, &top_iter,
&child_iter, &child_iter,
page_index++); page_index++);
@ -1808,7 +1809,7 @@ prefs_dialog_new (Gimp *gimp,
"environment.png", "environment.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Environment"), _("Environment"),
"dialogs/preferences/environment.html", GIMP_HELP_PREFS_ENVIRONMENT,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1866,7 +1867,7 @@ prefs_dialog_new (Gimp *gimp,
"folders.png", "folders.png",
GTK_TREE_STORE (tree), GTK_TREE_STORE (tree),
_("Folders"), _("Folders"),
"dialogs/preferences/folders.html", GIMP_HELP_PREFS_FOLDERS,
NULL, NULL,
&top_iter, &top_iter,
page_index++); page_index++);
@ -1915,39 +1916,39 @@ prefs_dialog_new (Gimp *gimp,
paths[] = paths[] =
{ {
{ N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png",
"dialogs/preferences/folders.html#brushes", GIMP_HELP_PREFS_FOLDERS_BRUSHES,
N_("Select Brush Folders"), N_("Select Brush Folders"),
"brush-path" }, "brush-path" },
{ N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png",
"dialogs/preferences/folders.html#patterns", GIMP_HELP_PREFS_FOLDERS_PATTERNS,
N_("Select Pattern Folders"), N_("Select Pattern Folders"),
"pattern-path" }, "pattern-path" },
{ N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png",
"dialogs/preferences/folders.html#palettes", GIMP_HELP_PREFS_FOLDERS_PALETTES,
N_("Select Palette Folders"), N_("Select Palette Folders"),
"palette-path" }, "palette-path" },
{ N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",
"dialogs/preferences/folders.html#gradients", GIMP_HELP_PREFS_FOLDERS_GRADIENTS,
N_("Select Gradient Folders"), N_("Select Gradient Folders"),
"gradient-path" }, "gradient-path" },
{ N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", { 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"), N_("Select Plug-In Folders"),
"plug-in-path" }, "plug-in-path" },
{ N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png", { N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png",
"dialogs/preferences/folders.html#scripts", GIMP_HELP_PREFS_FOLDERS_SCRIPTS,
N_("Select Script-Fu Folders"), N_("Select Script-Fu Folders"),
"script-fu-path" }, "script-fu-path" },
{ N_("Modules"), N_("Module Folders"), "folders-modules.png", { N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules", GIMP_HELP_PREFS_FOLDERS_MODULES,
N_("Select Module Folders"), N_("Select Module Folders"),
"module-path" }, "module-path" },
{ N_("Environment"), N_("Environment Folders"), "folders-environ.png", { N_("Environment"), N_("Environment Folders"), "folders-environ.png",
"dialogs/preferences/folders.html#environ", GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT,
N_("Select Environment Folders"), N_("Select Environment Folders"),
"environ-path" }, "environ-path" },
{ N_("Themes"), N_("Theme Folders"), "folders-themes.png", { N_("Themes"), N_("Theme Folders"), "folders-themes.png",
"dialogs/preferences/folders.html#themes", GIMP_HELP_PREFS_FOLDERS_THEMES,
N_("Select Theme Folders"), N_("Select Theme Folders"),
"theme-path" } "theme-path" }
}; };

21
app/gui/qmask-commands.c
View File

@ -31,6 +31,7 @@
#include "core/gimpimage-qmask.h" #include "core/gimpimage-qmask.h"
#include "widgets/gimpcolorpanel.h" #include "widgets/gimpcolorpanel.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -56,7 +57,7 @@ struct _EditQmaskOptions
/* local function prototypes */ /* local function prototypes */
static void qmask_channel_query (GimpDisplayShell *shell); 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); gpointer client_data);
static void qmask_query_scale_update (GtkAdjustment *adjustment, static void qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data); gpointer data);
@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell)
options->gimage = shell->gdisp->gimage; options->gimage = shell->gdisp->gimage;
options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"), options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"),
&options->gimage->qmask_color, &options->gimage->qmask_color,
GIMP_COLOR_AREA_LARGE_CHECKS, GIMP_COLOR_AREA_LARGE_CHECKS,
48, 64); 48, 64);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel), gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel),
gimp_get_user_context (options->gimage->gimp)); gimp_get_user_context (options->gimage->gimp));
@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell)
GIMP_STOCK_QMASK_ON, GIMP_STOCK_QMASK_ON,
_("Edit QuickMask Attributes"), _("Edit QuickMask Attributes"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/edit_qmask_attributes.html", GIMP_HELP_QMASK_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE, NULL, 1, NULL, FALSE, TRUE,
@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell)
/* The opacity scale */ /* The opacity scale */
opacity_scale_data = 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); 0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_size_request (opacity_scale, 100, -1); 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_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed), G_CALLBACK (qmask_query_color_changed),
opacity_scale_data); opacity_scale_data);
gtk_widget_show (options->query_box); gtk_widget_show (options->query_box);
} }
static void static void
qmask_query_ok_callback (GtkWidget *widget, qmask_query_ok_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
EditQmaskOptions *options; EditQmaskOptions *options;
GimpChannel *channel; GimpChannel *channel;
@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget,
gtk_widget_destroy (options->query_box); gtk_widget_destroy (options->query_box);
} }
static void static void
qmask_query_scale_update (GtkAdjustment *adjustment, qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data) gpointer data)
{ {
GimpRGB color; GimpRGB color;

13
app/gui/qmask-menu.c
View File

@ -26,6 +26,7 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -42,22 +43,26 @@ GimpItemFactoryEntry qmask_menu_entries[] =
{ {
{ { N_("/_QMask Active"), NULL, { { N_("/_QMask Active"), NULL,
qmask_toggle_cmd_callback, 0, "<ToggleItem>" }, qmask_toggle_cmd_callback, 0, "<ToggleItem>" },
NULL, NULL, NULL }, NULL,
GIMP_HELP_QMASK_TOGGLE, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/Mask _Selected Areas"), NULL, { { N_("/Mask _Selected Areas"), NULL,
qmask_invert_cmd_callback, TRUE, "<RadioItem>" }, qmask_invert_cmd_callback, TRUE, "<RadioItem>" },
NULL, NULL, NULL }, NULL,
GIMP_HELP_QMASK_INVERT, NULL },
{ { N_("/Mask _Unselected Areas"), NULL, { { N_("/Mask _Unselected Areas"), NULL,
qmask_invert_cmd_callback, FALSE, "/Mask Selected Areas" }, qmask_invert_cmd_callback, FALSE, "/Mask Selected Areas" },
NULL, NULL, NULL }, NULL,
GIMP_HELP_QMASK_INVERT, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/_Configure Color and Opacity..."), NULL, { { N_("/_Configure Color and Opacity..."), NULL,
qmask_configure_cmd_callback, 0 }, 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); gint n_qmask_menu_entries = G_N_ELEMENTS (qmask_menu_entries);

5
app/gui/templates-commands.c
View File

@ -32,6 +32,7 @@
#include "core/gimptemplate.h" #include "core/gimptemplate.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimptemplateeditor.h" #include "widgets/gimptemplateeditor.h"
#include "widgets/gimptemplateview.h" #include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
@ -133,7 +134,7 @@ templates_new_template_dialog (Gimp *gimp,
GIMP_STOCK_TEMPLATE, GIMP_STOCK_TEMPLATE,
_("Create a New Template"), _("Create a New Template"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/new_template.html", GIMP_HELP_TEMPLATE_NEW,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE, NULL, (gpointer) 1, NULL, FALSE, TRUE,
@ -202,7 +203,7 @@ templates_edit_template_dialog (Gimp *gimp,
GIMP_STOCK_EDIT, GIMP_STOCK_EDIT,
_("Edit Template"), _("Edit Template"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/edit_template.html", GIMP_HELP_TEMPLATE_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy, GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE, NULL, (gpointer) 1, NULL, FALSE, TRUE,

2
app/gui/toolbox-menu.c
View File

@ -84,7 +84,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
dialogs_create_toplevel_cmd_callback, 0, dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES }, "<StockItem>", GTK_STOCK_PREFERENCES },
"gimp-preferences-dialog", "gimp-preferences-dialog",
GIMP_HELP_PREFERENCES_DIALOG, NULL }, GIMP_HELP_PREFS_DIALOG, NULL },
/* <Toolbox>/File/Dialogs */ /* <Toolbox>/File/Dialogs */

8
app/gui/vectors-menu.c
View File

@ -73,22 +73,22 @@ GimpItemFactoryEntry vectors_menu_entries[] =
vectors_selection_replace_cmd_callback, 0, vectors_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_PATH_SEL_REPLACE, NULL }, GIMP_HELP_PATH_SELECTION_REPLACE, NULL },
{ { N_("/_Add to Selection"), NULL, { { N_("/_Add to Selection"), NULL,
vectors_selection_add_cmd_callback, 0, vectors_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_PATH_SEL_ADD, NULL }, GIMP_HELP_PATH_SELECTION_ADD, NULL },
{ { N_("/_Subtract from Selection"), NULL, { { N_("/_Subtract from Selection"), NULL,
vectors_selection_sub_cmd_callback, 0, vectors_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_PATH_SEL_SUB, NULL }, GIMP_HELP_PATH_SELECTION_SUBTRACT, NULL },
{ { N_("/_Intersect with Selection"), NULL, { { N_("/_Intersect with Selection"), NULL,
vectors_selection_intersect_cmd_callback, 0, vectors_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_PATH_SEL_INTERSECT, NULL }, GIMP_HELP_PATH_SELECTION_INTERSECT, NULL },
{ { N_("/Selecti_on to Path"), "<control>P", { { N_("/Selecti_on to Path"), "<control>P",
vectors_selection_to_vectors_cmd_callback, 0, vectors_selection_to_vectors_cmd_callback, 0,

5
app/menus/file-open-menu.c
View File

@ -30,6 +30,7 @@
#include "plug-in/plug-in-proc.h" #include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "file-commands.h" #include "file-commands.h"
@ -44,14 +45,14 @@ GimpItemFactoryEntry file_open_menu_entries[] =
{ { N_("/Automatic"), NULL, { { N_("/Automatic"), NULL,
file_open_by_extension_cmd_callback, 0 }, file_open_by_extension_cmd_callback, 0 },
NULL, NULL,
"open_by_extension.html", NULL }, GIMP_HELP_FILE_OPEN_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---") MENU_SEPARATOR ("/---")
}; };
gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries); gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries);
void void
file_open_menu_setup (GimpItemFactory *factory) file_open_menu_setup (GimpItemFactory *factory)
{ {

3
app/menus/file-save-menu.c
View File

@ -31,6 +31,7 @@
#include "plug-in/plug-in-proc.h" #include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "file-commands.h" #include "file-commands.h"
@ -45,7 +46,7 @@ GimpItemFactoryEntry file_save_menu_entries[] =
{ { N_("/By Extension"), NULL, { { N_("/By Extension"), NULL,
file_save_by_extension_cmd_callback, 0 }, file_save_by_extension_cmd_callback, 0 },
NULL, NULL,
"save_by_extension.html", NULL }, GIMP_HELP_FILE_SAVE_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---") MENU_SEPARATOR ("/---")
}; };

18
app/menus/image-menu.c
View File

@ -314,7 +314,7 @@ GimpItemFactoryEntry image_menu_entries[] =
select_toggle_quickmask_cmd_callback, 0, select_toggle_quickmask_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_QMASK_ON }, "<StockItem>", GIMP_STOCK_QMASK_ON },
NULL, NULL,
GIMP_HELP_SELECT_QUICKMASK, NULL }, GIMP_HELP_QMASK_TOGGLE, NULL },
{ { N_("/Select/Save to _Channel"), NULL, { { N_("/Select/Save to _Channel"), NULL,
select_save_cmd_callback, 0, select_save_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_TO_CHANNEL }, "<StockItem>", GIMP_STOCK_SELECTION_TO_CHANNEL },
@ -753,22 +753,22 @@ GimpItemFactoryEntry image_menu_entries[] =
layers_mask_selection_replace_cmd_callback, 0, layers_mask_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_REPLACE, NULL },
{ { N_("/Layer/Mask/_Add to Selection"), NULL, { { N_("/Layer/Mask/_Add to Selection"), NULL,
layers_mask_selection_add_cmd_callback, 0, layers_mask_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_ADD, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_ADD, NULL },
{ { N_("/Layer/Mask/_Subtract from Selection"), NULL, { { N_("/Layer/Mask/_Subtract from Selection"), NULL,
layers_mask_selection_sub_cmd_callback, 0, layers_mask_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_SUB, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT, NULL },
{ { N_("/Layer/Mask/_Intersect with Selection"), NULL, { { N_("/Layer/Mask/_Intersect with Selection"), NULL,
layers_mask_selection_intersect_cmd_callback, 0, layers_mask_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_LAYER_MASK_SEL_INTERSECT, NULL }, GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT, NULL },
/* <Image>/Layer/Transparency */ /* <Image>/Layer/Transparency */
@ -785,22 +785,22 @@ GimpItemFactoryEntry image_menu_entries[] =
layers_alpha_selection_replace_cmd_callback, 0, layers_alpha_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_REPLACE, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE, NULL },
{ { N_("/Layer/Transparency/A_dd to Selection"), NULL, { { N_("/Layer/Transparency/A_dd to Selection"), NULL,
layers_alpha_selection_add_cmd_callback, 0, layers_alpha_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD }, "<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_ADD, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_ADD, NULL },
{ { N_("/Layer/Transparency/_Subtract from Selection"), NULL, { { N_("/Layer/Transparency/_Subtract from Selection"), NULL,
layers_alpha_selection_sub_cmd_callback, 0, layers_alpha_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT }, "<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_SUB, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT, NULL },
{ { N_("/Layer/Transparency/_Intersect with Selection"), NULL, { { N_("/Layer/Transparency/_Intersect with Selection"), NULL,
layers_alpha_selection_intersect_cmd_callback, 0, layers_alpha_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT }, "<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL, NULL,
GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT, NULL }, GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT, NULL },
MENU_SEPARATOR ("/Layer/Transparency/---"), MENU_SEPARATOR ("/Layer/Transparency/---"),

7
app/menus/menus.c
View File

@ -33,6 +33,7 @@
#include "file/file-utils.h" #include "file/file-utils.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
@ -297,7 +298,7 @@ menus_last_opened_add (GimpItemFactory *item_factory,
for (i = 0; i < n; i++) 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); g_strdup_printf ("/File/Open Recent/%02d", i + 1);
if (i < 9) if (i < 9)
@ -311,7 +312,7 @@ menus_last_opened_add (GimpItemFactory *item_factory,
last_opened_entries[i].entry.item_type = "<StockItem>"; last_opened_entries[i].entry.item_type = "<StockItem>";
last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN; last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN;
last_opened_entries[i].quark_string = NULL; 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; last_opened_entries[i].description = NULL;
} }
@ -371,7 +372,7 @@ menus_filters_subdirs_to_top (GtkMenu *menu)
{ {
menu_item = GTK_MENU_ITEM (list->data); menu_item = GTK_MENU_ITEM (list->data);
items++; items++;
if (menu_item->submenu) if (menu_item->submenu)
{ {
if (submenus_passed) if (submenus_passed)

2
app/menus/toolbox-menu.c
View File

@ -84,7 +84,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
dialogs_create_toplevel_cmd_callback, 0, dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES }, "<StockItem>", GTK_STOCK_PREFERENCES },
"gimp-preferences-dialog", "gimp-preferences-dialog",
GIMP_HELP_PREFERENCES_DIALOG, NULL }, GIMP_HELP_PREFS_DIALOG, NULL },
/* <Toolbox>/File/Dialogs */ /* <Toolbox>/File/Dialogs */

64
app/paint/gimpink.c
View File

@ -43,6 +43,8 @@
#include "paint/gimppaintoptions.h" #include "paint/gimppaintoptions.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpinkoptions.h" #include "gimpinkoptions.h"
@ -105,19 +107,19 @@ static gdouble dist_smoother_result (GimpInkTool *ink_tool);
static void dist_smoother_init (GimpInkTool *ink_tool, static void dist_smoother_init (GimpInkTool *ink_tool,
gdouble initval); gdouble initval);
static void ink_init (GimpInkTool *ink_tool, static void ink_init (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
gdouble x, gdouble x,
gdouble y); gdouble y);
static void ink_finish (GimpInkTool *ink_tool, static void ink_finish (GimpInkTool *ink_tool,
GimpDrawable *drawable); GimpDrawable *drawable);
static void ink_cleanup (void); static void ink_cleanup (void);
/* Rendering functions */ /* Rendering functions */
static void ink_set_paint_area (GimpInkTool *ink_tool, static void ink_set_paint_area (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob); Blob *blob);
static void ink_paste (GimpInkTool *ink_tool, static void ink_paste (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob); Blob *blob);
@ -126,13 +128,13 @@ static void ink_to_canvas_tiles (GimpInkTool *ink_tool,
guchar *color); guchar *color);
static void ink_set_undo_tiles (GimpDrawable *drawable, static void ink_set_undo_tiles (GimpDrawable *drawable,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
static void ink_set_canvas_tiles (gint x, static void ink_set_canvas_tiles (gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
@ -167,7 +169,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback,
_("Ink"), _("Ink"),
_("Draw in ink"), _("Draw in ink"),
N_("/Tools/Paint Tools/In_k"), "K", N_("/Tools/Paint Tools/In_k"), "K",
NULL, "tools/ink.html", NULL, GIMP_HELP_TOOL_INK,
GIMP_STOCK_TOOL_INK, GIMP_STOCK_TOOL_INK,
data); data);
} }
@ -193,7 +195,7 @@ gimp_ink_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TOOL,
"GimpInkTool", "GimpInkTool",
&tool_info, 0); &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); ink_init (ink_tool, drawable, curr_coords.x, curr_coords.y);
gimp_tool_control_activate (tool->control); gimp_tool_control_activate (tool->control);
tool->gdisp = gdisp; tool->gdisp = gdisp;
/* pause the current selection */ /* pause the current selection */
gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_PAUSE); 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); g_free (ink_tool->last_blob);
ink_tool->last_blob = b; ink_tool->last_blob = b;
ink_paste (ink_tool, drawable, blob_union); ink_paste (ink_tool, drawable, blob_union);
g_free (blob_union); g_free (blob_union);
gimp_display_flush_now (gdisp); gimp_display_flush_now (gdisp);
@ -510,7 +512,7 @@ ink_pen_ellipse (GimpInkOptions *options,
#ifdef VERBOSE #ifdef VERBOSE
g_print ("%f (%f) -> ", (float)size, (float)velocity); g_print ("%f (%f) -> ", (float)size, (float)velocity);
#endif #endif
size = (options->vel_sensitivity * size = (options->vel_sensitivity *
((4.5 * size) / (1.0 + options->vel_sensitivity * (2.0 * velocity))) ((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, return (* function) (x_center * SUBSAMPLE,
y_center * SUBSAMPLE, y_center * SUBSAMPLE,
radmin * aspect * tcos, radmin * aspect * tcos,
radmin * aspect * tsin, radmin * aspect * tsin,
-radmin * tsin, -radmin * tsin,
radmin * tcos); radmin * tcos);
} }
@ -671,7 +673,7 @@ time_smoother_add (GimpInkTool *ink_tool,
static void static void
ink_init (GimpInkTool *ink_tool, ink_init (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
@ -744,7 +746,7 @@ ink_cleanup (void)
* Rendering functions * * 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 * code it was copied from in paint_core.c; but I wanted
* to learn this stuff, so I've kept it simple. * to learn this stuff, so I've kept it simple.
* *
@ -754,8 +756,8 @@ ink_cleanup (void)
*/ */
static void static void
ink_set_paint_area (GimpInkTool *ink_tool, ink_set_paint_area (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob) Blob *blob)
{ {
GimpItem *item = GIMP_ITEM (drawable); GimpItem *item = GIMP_ITEM (drawable);
@ -846,7 +848,7 @@ render_blob_line (Blob *blob,
gint last_x; gint last_x;
/* Sort start and ends for all lines */ /* Sort start and ends for all lines */
j = y * SUBSAMPLE - blob->y; j = y * SUBSAMPLE - blob->y;
for (i = 0; i < SUBSAMPLE; i++) 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))) while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width)))
n--; n--;
/* Render the row */ /* Render the row */
last_x = 0; last_x = 0;
@ -904,7 +906,7 @@ render_blob_line (Blob *blob,
fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x); fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x);
/* Compute the value for this pixel */ /* Compute the value for this pixel */
pixel = current * SUBSAMPLE; pixel = current * SUBSAMPLE;
while (i<n) while (i<n)
{ {
@ -923,7 +925,7 @@ render_blob_line (Blob *blob,
current--; current--;
pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2 * i]; pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2 * i];
} }
i++; i++;
} }
@ -945,8 +947,8 @@ render_blob (PixelRegion *dest,
guchar *s; guchar *s;
gpointer pr; gpointer pr;
for (pr = pixel_regions_register (1, dest); for (pr = pixel_regions_register (1, dest);
pr != NULL; pr != NULL;
pr = pixel_regions_process (pr)) pr = pixel_regions_process (pr))
{ {
h = dest->h; h = dest->h;
@ -962,7 +964,7 @@ render_blob (PixelRegion *dest,
} }
static void static void
ink_paste (GimpInkTool *ink_tool, ink_paste (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob) Blob *blob)
{ {
@ -979,7 +981,7 @@ ink_paste (GimpInkTool *ink_tool,
/* Get the the buffer */ /* Get the the buffer */
ink_set_paint_area (ink_tool, drawable, blob); ink_set_paint_area (ink_tool, drawable, blob);
/* check to make sure there is actually a canvas to draw on */ /* check to make sure there is actually a canvas to draw on */
if (!canvas_buf) if (!canvas_buf)
return; return;
@ -1117,8 +1119,8 @@ ink_set_canvas_tiles (gint x,
if (tile_is_valid (tile) == FALSE) if (tile_is_valid (tile) == FALSE)
{ {
tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE); tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE);
memset (tile_data_pointer (tile, 0, 0), memset (tile_data_pointer (tile, 0, 0),
0, 0,
tile_size (tile)); tile_size (tile));
tile_release (tile, TRUE); tile_release (tile, TRUE);
} }

3
app/tools/gimpairbrushtool.c
View File

@ -29,6 +29,7 @@
#include "paint/gimpairbrush.h" #include "paint/gimpairbrush.h"
#include "paint/gimpairbrushoptions.h" #include "paint/gimpairbrushoptions.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "gimpairbrushtool.h" #include "gimpairbrushtool.h"
@ -61,7 +62,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback callback,
_("Airbrush"), _("Airbrush"),
_("Airbrush with variable pressure"), _("Airbrush with variable pressure"),
N_("/Tools/Paint Tools/_Airbrush"), "A", N_("/Tools/Paint Tools/_Airbrush"), "A",
NULL, "tools/airbrush.html", NULL, GIMP_HELP_TOOL_AIRBRUSH,
GIMP_STOCK_TOOL_AIRBRUSH, GIMP_STOCK_TOOL_AIRBRUSH,
data); data);
} }

4
app/tools/gimpblendtool.c
View File

@ -34,6 +34,8 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpprogress.h" #include "display/gimpprogress.h"
@ -96,7 +98,7 @@ gimp_blend_tool_register (GimpToolRegisterCallback callback,
_("Blend"), _("Blend"),
_("Fill with a color gradient"), _("Fill with a color gradient"),
N_("/Tools/Paint Tools/Blen_d"), "L", N_("/Tools/Paint Tools/Blen_d"), "L",
NULL, "tools/blend.html", NULL, GIMP_HELP_TOOL_BLEND,
GIMP_STOCK_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND,
data); data);
} }

6
app/tools/gimpbrightnesscontrasttool.c
View File

@ -32,6 +32,8 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpbrightnesscontrasttool.h" #include "gimpbrightnesscontrasttool.h"
@ -82,7 +84,7 @@ gimp_brightness_contrast_tool_register (GimpToolRegisterCallback callback,
_("Brightness-Contrast"), _("Brightness-Contrast"),
_("Adjust brightness and contrast"), _("Adjust brightness and contrast"),
N_("/Tools/Color Tools/B_rightness-Contrast..."), NULL, N_("/Tools/Color Tools/B_rightness-Contrast..."), NULL,
NULL, "tools/brightness_contrast.html", NULL, GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST,
GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST,
data); data);
} }
@ -108,7 +110,7 @@ gimp_brightness_contrast_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpBrightnessContrastTool", "GimpBrightnessContrastTool",
&tool_info, 0); &tool_info, 0);
} }

8
app/tools/gimpbucketfilltool.c
View File

@ -34,6 +34,8 @@
#include "core/gimpimage-mask.h" #include "core/gimpimage-mask.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpbucketfilloptions.h" #include "gimpbucketfilloptions.h"
@ -76,7 +78,7 @@ static void gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
void void
gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback, gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
(* callback) (GIMP_TYPE_BUCKET_FILL_TOOL, (* callback) (GIMP_TYPE_BUCKET_FILL_TOOL,
GIMP_TYPE_BUCKET_FILL_OPTIONS, GIMP_TYPE_BUCKET_FILL_OPTIONS,
@ -88,7 +90,7 @@ gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback,
_("Bucket Fill"), _("Bucket Fill"),
_("Fill with a color or pattern"), _("Fill with a color or pattern"),
N_("/Tools/Paint Tools/_Bucket Fill"), "<shift>B", N_("/Tools/Paint Tools/_Bucket Fill"), "<shift>B",
NULL, "tools/bucket_fill.html", NULL, GIMP_HELP_TOOL_BUCKET_FILL,
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL,
data); data);
} }
@ -114,7 +116,7 @@ gimp_bucket_fill_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TOOL,
"GimpBucketFillTool", "GimpBucketFillTool",
&tool_info, 0); &tool_info, 0);
} }

4
app/tools/gimpbycolorselecttool.c
View File

@ -31,6 +31,8 @@
#include "core/gimpimage-projection.h" #include "core/gimpimage-projection.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpbycolorselecttool.h" #include "gimpbycolorselecttool.h"
@ -80,7 +82,7 @@ gimp_by_color_select_tool_register (GimpToolRegisterCallback callback,
_("Select By Color"), _("Select By Color"),
_("Select regions by color"), _("Select regions by color"),
N_("/Tools/Selection Tools/_By Color Select"), NULL, 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, GIMP_STOCK_TOOL_BY_COLOR_SELECT,
data); data);
} }

7
app/tools/gimpclonetool.c
View File

@ -32,10 +32,11 @@
#include "paint/gimpclone.h" #include "paint/gimpclone.h"
#include "paint/gimpcloneoptions.h" #include "paint/gimpcloneoptions.h"
#include "display/gimpdisplay.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "display/gimpdisplay.h"
#include "gimpclonetool.h" #include "gimpclonetool.h"
#include "gimppaintoptions-gui.h" #include "gimppaintoptions-gui.h"
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
@ -98,7 +99,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback callback,
_("Clone"), _("Clone"),
_("Paint using Patterns or Image Regions"), _("Paint using Patterns or Image Regions"),
N_("/Tools/Paint Tools/_Clone"), "C", N_("/Tools/Paint Tools/_Clone"), "C",
NULL, "tools/clone.html", NULL, GIMP_HELP_TOOL_CLONE,
GIMP_STOCK_TOOL_CLONE, GIMP_STOCK_TOOL_CLONE,
data); data);
} }

7
app/tools/gimpcolorbalancetool.c
View File

@ -32,10 +32,11 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "display/gimpdisplay.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "display/gimpdisplay.h"
#include "gimpcolorbalancetool.h" #include "gimpcolorbalancetool.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -94,7 +95,7 @@ gimp_color_balance_tool_register (GimpToolRegisterCallback callback,
_("Color Balance"), _("Color Balance"),
_("Adjust color balance"), _("Adjust color balance"),
N_("/Tools/Color Tools/Color _Balance..."), NULL, N_("/Tools/Color Tools/Color _Balance..."), NULL,
NULL, "tools/color_balance.html", NULL, GIMP_HELP_TOOL_COLOR_BALANCE,
GIMP_STOCK_TOOL_COLOR_BALANCE, GIMP_STOCK_TOOL_COLOR_BALANCE,
data); data);
} }

6
app/tools/gimpcolorizetool.c
View File

@ -32,6 +32,8 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpcolorizetool.h" #include "gimpcolorizetool.h"
@ -93,7 +95,7 @@ gimp_colorize_tool_register (GimpToolRegisterCallback callback,
_("Colorize"), _("Colorize"),
_("Colorize the image"), _("Colorize the image"),
N_("/Tools/Color Tools/Colori_ze..."), NULL, N_("/Tools/Color Tools/Colori_ze..."), NULL,
NULL, "tools/colorize.html", NULL, GIMP_HELP_TOOL_COLORIZE,
GIMP_STOCK_TOOL_COLORIZE, GIMP_STOCK_TOOL_COLORIZE,
data); data);
} }
@ -119,7 +121,7 @@ gimp_colorize_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpColorizeTool", "GimpColorizeTool",
&tool_info, 0); &tool_info, 0);
} }

3
app/tools/gimpcolorpickertool.c
View File

@ -36,6 +36,7 @@
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppaletteeditor.h" #include "widgets/gimppaletteeditor.h"
#include "widgets/gimptoolbox-color-area.h" #include "widgets/gimptoolbox-color-area.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
@ -102,7 +103,7 @@ gimp_color_picker_tool_register (GimpToolRegisterCallback callback,
_("Color Picker"), _("Color Picker"),
_("Pick colors from the image"), _("Pick colors from the image"),
N_("/Tools/C_olor Picker"), "O", N_("/Tools/C_olor Picker"), "O",
NULL, "tools/color_picker.html", NULL, GIMP_HELP_TOOL_COLOR_PICKER,
GIMP_STOCK_TOOL_COLOR_PICKER, GIMP_STOCK_TOOL_COLOR_PICKER,
data); data);
} }

3
app/tools/gimpconvolvetool.c
View File

@ -40,6 +40,7 @@
#include "paint/gimpconvolve.h" #include "paint/gimpconvolve.h"
#include "paint/gimpconvolveoptions.h" #include "paint/gimpconvolveoptions.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -90,7 +91,7 @@ gimp_convolve_tool_register (GimpToolRegisterCallback callback,
_("Convolve"), _("Convolve"),
_("Blur or Sharpen"), _("Blur or Sharpen"),
N_("/Tools/Paint Tools/Con_volve"), "V", N_("/Tools/Paint Tools/Con_volve"), "V",
NULL, "tools/convolve.html", NULL, GIMP_HELP_TOOL_CONVOLVE,
GIMP_STOCK_TOOL_BLUR, GIMP_STOCK_TOOL_BLUR,
data); data);
} }

13
app/tools/gimpcroptool.c
View File

@ -33,16 +33,17 @@
#include "core/gimpimage-mask.h" #include "core/gimpimage-mask.h"
#include "core/gimptoolinfo.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.h"
#include "display/gimpdisplay-foreach.h" #include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-transform.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__ #ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h" #warning FIXME #include "gui/gui-types.h"
#endif #endif
@ -162,7 +163,7 @@ gimp_crop_tool_register (GimpToolRegisterCallback callback,
_("Crop & Resize"), _("Crop & Resize"),
_("Crop or Resize an image"), _("Crop or Resize an image"),
N_("/Tools/Transform Tools/_Crop & Resize"), "<shift>C", N_("/Tools/Transform Tools/_Crop & Resize"), "<shift>C",
NULL, "tools/crop_tool.html", NULL, GIMP_HELP_TOOL_CROP,
GIMP_STOCK_TOOL_CROP, GIMP_STOCK_TOOL_CROP,
data); data);
} }

3
app/tools/gimpcurvestool.c
View File

@ -48,6 +48,7 @@
#include "widgets/gimpcursor.h" #include "widgets/gimpcursor.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -159,7 +160,7 @@ gimp_curves_tool_register (GimpToolRegisterCallback callback,
_("Curves"), _("Curves"),
_("Adjust color curves"), _("Adjust color curves"),
N_("/Tools/Color Tools/_Curves..."), NULL, N_("/Tools/Color Tools/_Curves..."), NULL,
NULL, "tools/curves.html", NULL, GIMP_HELP_TOOL_CURVES,
GIMP_STOCK_TOOL_CURVES, GIMP_STOCK_TOOL_CURVES,
data); data);
} }

3
app/tools/gimpdodgeburntool.c
View File

@ -29,6 +29,7 @@
#include "paint/gimpdodgeburn.h" #include "paint/gimpdodgeburn.h"
#include "paint/gimpdodgeburnoptions.h" #include "paint/gimpdodgeburnoptions.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -70,7 +71,7 @@ gimp_dodgeburn_tool_register (GimpToolRegisterCallback callback,
_("Dodge/Burn"), _("Dodge/Burn"),
_("Dodge or Burn strokes"), _("Dodge or Burn strokes"),
N_("/Tools/Paint Tools/Dod_geBurn"), "<shift>D", N_("/Tools/Paint Tools/Dod_geBurn"), "<shift>D",
NULL, "tools/dodgeburn.html", NULL, GIMP_HELP_TOOL_DODGE_BURN,
GIMP_STOCK_TOOL_DODGE, GIMP_STOCK_TOOL_DODGE,
data); data);
} }

8
app/tools/gimpellipseselecttool.c
View File

@ -32,6 +32,8 @@
#include "core/gimpimage-mask-select.h" #include "core/gimpimage-mask-select.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpellipseselecttool.h" #include "gimpellipseselecttool.h"
@ -60,7 +62,7 @@ static GimpRectSelectToolClass *parent_class = NULL;
void void
gimp_ellipse_select_tool_register (GimpToolRegisterCallback callback, gimp_ellipse_select_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
(* callback) (GIMP_TYPE_ELLIPSE_SELECT_TOOL, (* callback) (GIMP_TYPE_ELLIPSE_SELECT_TOOL,
GIMP_TYPE_SELECTION_OPTIONS, GIMP_TYPE_SELECTION_OPTIONS,
@ -70,7 +72,7 @@ gimp_ellipse_select_tool_register (GimpToolRegisterCallback callback,
_("Ellipse Select"), _("Ellipse Select"),
_("Select elliptical regions"), _("Select elliptical regions"),
N_("/Tools/Selection Tools/_Ellipse Select"), "E", N_("/Tools/Selection Tools/_Ellipse Select"), "E",
NULL, "tools/ellipse_select.html", NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,
GIMP_STOCK_TOOL_ELLIPSE_SELECT, GIMP_STOCK_TOOL_ELLIPSE_SELECT,
data); data);
} }
@ -96,7 +98,7 @@ gimp_ellipse_select_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_RECT_SELECT_TOOL, tool_type = g_type_register_static (GIMP_TYPE_RECT_SELECT_TOOL,
"GimpEllipseSelectTool", "GimpEllipseSelectTool",
&tool_info, 0); &tool_info, 0);
} }

3
app/tools/gimperasertool.c
View File

@ -29,6 +29,7 @@
#include "paint/gimperaser.h" #include "paint/gimperaser.h"
#include "paint/gimperaseroptions.h" #include "paint/gimperaseroptions.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -70,7 +71,7 @@ gimp_eraser_tool_register (GimpToolRegisterCallback callback,
_("Eraser"), _("Eraser"),
_("Erase to background or transparency"), _("Erase to background or transparency"),
N_("/Tools/Paint Tools/_Eraser"), "<shift>E", N_("/Tools/Paint Tools/_Eraser"), "<shift>E",
NULL, "tools/eraser.html", NULL, GIMP_HELP_TOOL_ERASER,
GIMP_STOCK_TOOL_ERASER, GIMP_STOCK_TOOL_ERASER,
data); data);
} }

7
app/tools/gimpfliptool.c
View File

@ -36,6 +36,7 @@
#include "core/gimpitem-linked.h" #include "core/gimpitem-linked.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -72,7 +73,7 @@ static GimpTransformToolClass *parent_class = NULL;
/* public functions */ /* public functions */
void void
gimp_flip_tool_register (GimpToolRegisterCallback callback, gimp_flip_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
@ -84,7 +85,7 @@ gimp_flip_tool_register (GimpToolRegisterCallback callback,
_("Flip"), _("Flip"),
_("Flip the layer or selection"), _("Flip the layer or selection"),
N_("/Tools/Transform Tools/_Flip"), "<shift>F", N_("/Tools/Transform Tools/_Flip"), "<shift>F",
NULL, "tools/flip.html", NULL, GIMP_HELP_TOOL_FLIP,
GIMP_STOCK_TOOL_FLIP, GIMP_STOCK_TOOL_FLIP,
data); data);
} }
@ -110,7 +111,7 @@ gimp_flip_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
"GimpFlipTool", "GimpFlipTool",
&tool_info, 0); &tool_info, 0);
} }

6
app/tools/gimpfreeselecttool.c
View File

@ -36,6 +36,8 @@
#include "core/gimplayer-floating-sel.h" #include "core/gimplayer-floating-sel.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpeditselectiontool.h" #include "gimpeditselectiontool.h"
@ -96,7 +98,7 @@ gimp_free_select_tool_register (GimpToolRegisterCallback callback,
_("Free Select"), _("Free Select"),
_("Select hand-drawn regions"), _("Select hand-drawn regions"),
N_("/Tools/Selection Tools/_Free Select"), "F", N_("/Tools/Selection Tools/_Free Select"), "F",
NULL, "tools/free_select.html", NULL, GIMP_HELP_TOOL_FREE_SELECT,
GIMP_STOCK_TOOL_FREE_SELECT, GIMP_STOCK_TOOL_FREE_SELECT,
data); data);
} }
@ -122,7 +124,7 @@ gimp_free_select_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL,
"GimpFreeSelectTool", "GimpFreeSelectTool",
&tool_info, 0); &tool_info, 0);
} }

4
app/tools/gimpfuzzyselecttool.c
View File

@ -39,6 +39,8 @@
#include "core/gimplayer-floating-sel.h" #include "core/gimplayer-floating-sel.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-cursor.h" #include "display/gimpdisplayshell-cursor.h"
@ -98,7 +100,7 @@ gimp_fuzzy_select_tool_register (GimpToolRegisterCallback callback,
_("Fuzzy Select"), _("Fuzzy Select"),
_("Select contiguous regions"), _("Select contiguous regions"),
N_("/Tools/Selection Tools/Fu_zzy Select"), "Z", N_("/Tools/Selection Tools/Fu_zzy Select"), "Z",
NULL, "tools/fuzzy_select.html", NULL, GIMP_HELP_TOOL_FUZZY_SELECT,
GIMP_STOCK_TOOL_FUZZY_SELECT, GIMP_STOCK_TOOL_FUZZY_SELECT,
data); data);
} }

11
app/tools/gimphistogramtool.c
View File

@ -37,6 +37,7 @@
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimphistogrambox.h" #include "widgets/gimphistogrambox.h"
#include "widgets/gimphistogramview.h" #include "widgets/gimphistogramview.h"
#include "widgets/gimppropwidgets.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, static void histogram_tool_close_callback (GtkWidget *widget,
gpointer data); gpointer data);
static gboolean histogram_set_sensitive_callback static gboolean histogram_set_sensitive_callback
(gpointer item_data, (gpointer item_data,
HistogramToolDialog *htd); HistogramToolDialog *htd);
static void histogram_tool_dialog_update (HistogramToolDialog *htd, static void histogram_tool_dialog_update (HistogramToolDialog *htd,
@ -121,7 +122,7 @@ gimp_histogram_tool_register (GimpToolRegisterCallback callback,
_("Histogram"), _("Histogram"),
_("View image histogram"), _("View image histogram"),
N_("/Tools/Color Tools/_Histogram..."), NULL, N_("/Tools/Color Tools/_Histogram..."), NULL,
NULL, "tools/histogram.html", NULL, GIMP_HELP_TOOL_HISTOGRAM,
GIMP_STOCK_TOOL_HISTOGRAM, GIMP_STOCK_TOOL_HISTOGRAM,
data); data);
} }
@ -147,7 +148,7 @@ gimp_histogram_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpHistogramTool", "GimpHistogramTool",
&tool_info, 0); &tool_info, 0);
} }
@ -460,7 +461,7 @@ histogram_set_sensitive_callback (gpointer item_data,
HistogramToolDialog *htd) HistogramToolDialog *htd)
{ {
GimpHistogramChannel channel = GPOINTER_TO_INT (item_data); GimpHistogramChannel channel = GPOINTER_TO_INT (item_data);
switch (channel) switch (channel)
{ {
case GIMP_HISTOGRAM_VALUE: case GIMP_HISTOGRAM_VALUE:
@ -472,6 +473,6 @@ histogram_set_sensitive_callback (gpointer item_data,
case GIMP_HISTOGRAM_ALPHA: case GIMP_HISTOGRAM_ALPHA:
return gimp_drawable_has_alpha (htd->drawable); return gimp_drawable_has_alpha (htd->drawable);
} }
return FALSE; return FALSE;
} }

6
app/tools/gimphuesaturationtool.c
View File

@ -32,6 +32,8 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimphuesaturationtool.h" #include "gimphuesaturationtool.h"
@ -107,7 +109,7 @@ gimp_hue_saturation_tool_register (GimpToolRegisterCallback callback,
_("Hue-Saturation"), _("Hue-Saturation"),
_("Adjust hue and saturation"), _("Adjust hue and saturation"),
N_("/Tools/Color Tools/Hue-_Saturation..."), NULL, N_("/Tools/Color Tools/Hue-_Saturation..."), NULL,
NULL, "tools/hue_saturation.html", NULL, GIMP_HELP_TOOL_HUE_SATURATION,
GIMP_STOCK_TOOL_HUE_SATURATION, GIMP_STOCK_TOOL_HUE_SATURATION,
data); data);
} }
@ -133,7 +135,7 @@ gimp_hue_saturation_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpHueSaturationTool", "GimpHueSaturationTool",
&tool_info, 0); &tool_info, 0);
} }

64
app/tools/gimpinktool.c
View File

@ -43,6 +43,8 @@
#include "paint/gimppaintoptions.h" #include "paint/gimppaintoptions.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpinkoptions.h" #include "gimpinkoptions.h"
@ -105,19 +107,19 @@ static gdouble dist_smoother_result (GimpInkTool *ink_tool);
static void dist_smoother_init (GimpInkTool *ink_tool, static void dist_smoother_init (GimpInkTool *ink_tool,
gdouble initval); gdouble initval);
static void ink_init (GimpInkTool *ink_tool, static void ink_init (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
gdouble x, gdouble x,
gdouble y); gdouble y);
static void ink_finish (GimpInkTool *ink_tool, static void ink_finish (GimpInkTool *ink_tool,
GimpDrawable *drawable); GimpDrawable *drawable);
static void ink_cleanup (void); static void ink_cleanup (void);
/* Rendering functions */ /* Rendering functions */
static void ink_set_paint_area (GimpInkTool *ink_tool, static void ink_set_paint_area (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob); Blob *blob);
static void ink_paste (GimpInkTool *ink_tool, static void ink_paste (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob); Blob *blob);
@ -126,13 +128,13 @@ static void ink_to_canvas_tiles (GimpInkTool *ink_tool,
guchar *color); guchar *color);
static void ink_set_undo_tiles (GimpDrawable *drawable, static void ink_set_undo_tiles (GimpDrawable *drawable,
gint x, gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
static void ink_set_canvas_tiles (gint x, static void ink_set_canvas_tiles (gint x,
gint y, gint y,
gint w, gint w,
gint h); gint h);
@ -167,7 +169,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback,
_("Ink"), _("Ink"),
_("Draw in ink"), _("Draw in ink"),
N_("/Tools/Paint Tools/In_k"), "K", N_("/Tools/Paint Tools/In_k"), "K",
NULL, "tools/ink.html", NULL, GIMP_HELP_TOOL_INK,
GIMP_STOCK_TOOL_INK, GIMP_STOCK_TOOL_INK,
data); data);
} }
@ -193,7 +195,7 @@ gimp_ink_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TOOL,
"GimpInkTool", "GimpInkTool",
&tool_info, 0); &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); ink_init (ink_tool, drawable, curr_coords.x, curr_coords.y);
gimp_tool_control_activate (tool->control); gimp_tool_control_activate (tool->control);
tool->gdisp = gdisp; tool->gdisp = gdisp;
/* pause the current selection */ /* pause the current selection */
gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_PAUSE); 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); g_free (ink_tool->last_blob);
ink_tool->last_blob = b; ink_tool->last_blob = b;
ink_paste (ink_tool, drawable, blob_union); ink_paste (ink_tool, drawable, blob_union);
g_free (blob_union); g_free (blob_union);
gimp_display_flush_now (gdisp); gimp_display_flush_now (gdisp);
@ -510,7 +512,7 @@ ink_pen_ellipse (GimpInkOptions *options,
#ifdef VERBOSE #ifdef VERBOSE
g_print ("%f (%f) -> ", (float)size, (float)velocity); g_print ("%f (%f) -> ", (float)size, (float)velocity);
#endif #endif
size = (options->vel_sensitivity * size = (options->vel_sensitivity *
((4.5 * size) / (1.0 + options->vel_sensitivity * (2.0 * velocity))) ((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, return (* function) (x_center * SUBSAMPLE,
y_center * SUBSAMPLE, y_center * SUBSAMPLE,
radmin * aspect * tcos, radmin * aspect * tcos,
radmin * aspect * tsin, radmin * aspect * tsin,
-radmin * tsin, -radmin * tsin,
radmin * tcos); radmin * tcos);
} }
@ -671,7 +673,7 @@ time_smoother_add (GimpInkTool *ink_tool,
static void static void
ink_init (GimpInkTool *ink_tool, ink_init (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
@ -744,7 +746,7 @@ ink_cleanup (void)
* Rendering functions * * 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 * code it was copied from in paint_core.c; but I wanted
* to learn this stuff, so I've kept it simple. * to learn this stuff, so I've kept it simple.
* *
@ -754,8 +756,8 @@ ink_cleanup (void)
*/ */
static void static void
ink_set_paint_area (GimpInkTool *ink_tool, ink_set_paint_area (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob) Blob *blob)
{ {
GimpItem *item = GIMP_ITEM (drawable); GimpItem *item = GIMP_ITEM (drawable);
@ -846,7 +848,7 @@ render_blob_line (Blob *blob,
gint last_x; gint last_x;
/* Sort start and ends for all lines */ /* Sort start and ends for all lines */
j = y * SUBSAMPLE - blob->y; j = y * SUBSAMPLE - blob->y;
for (i = 0; i < SUBSAMPLE; i++) 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))) while ((n > 0) && (data[2*(n-1)] >= SUBSAMPLE*(x+width)))
n--; n--;
/* Render the row */ /* Render the row */
last_x = 0; last_x = 0;
@ -904,7 +906,7 @@ render_blob_line (Blob *blob,
fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x); fill_run (dest + last_x, (255 * current) / SUBSAMPLE, cur_x - last_x);
/* Compute the value for this pixel */ /* Compute the value for this pixel */
pixel = current * SUBSAMPLE; pixel = current * SUBSAMPLE;
while (i<n) while (i<n)
{ {
@ -923,7 +925,7 @@ render_blob_line (Blob *blob,
current--; current--;
pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2 * i]; pixel -= ((tmp_x + 1) * SUBSAMPLE) - data[2 * i];
} }
i++; i++;
} }
@ -945,8 +947,8 @@ render_blob (PixelRegion *dest,
guchar *s; guchar *s;
gpointer pr; gpointer pr;
for (pr = pixel_regions_register (1, dest); for (pr = pixel_regions_register (1, dest);
pr != NULL; pr != NULL;
pr = pixel_regions_process (pr)) pr = pixel_regions_process (pr))
{ {
h = dest->h; h = dest->h;
@ -962,7 +964,7 @@ render_blob (PixelRegion *dest,
} }
static void static void
ink_paste (GimpInkTool *ink_tool, ink_paste (GimpInkTool *ink_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
Blob *blob) Blob *blob)
{ {
@ -979,7 +981,7 @@ ink_paste (GimpInkTool *ink_tool,
/* Get the the buffer */ /* Get the the buffer */
ink_set_paint_area (ink_tool, drawable, blob); ink_set_paint_area (ink_tool, drawable, blob);
/* check to make sure there is actually a canvas to draw on */ /* check to make sure there is actually a canvas to draw on */
if (!canvas_buf) if (!canvas_buf)
return; return;
@ -1117,8 +1119,8 @@ ink_set_canvas_tiles (gint x,
if (tile_is_valid (tile) == FALSE) if (tile_is_valid (tile) == FALSE)
{ {
tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE); tile = tile_manager_get_tile (canvas_tiles, j, i, TRUE, TRUE);
memset (tile_data_pointer (tile, 0, 0), memset (tile_data_pointer (tile, 0, 0),
0, 0,
tile_size (tile)); tile_size (tile));
tile_release (tile, TRUE); tile_release (tile, TRUE);
} }

38
app/tools/gimpiscissorstool.c
View File

@ -71,6 +71,8 @@
#include "core/gimpscanconvert.h" #include "core/gimpscanconvert.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpiscissorstool.h" #include "gimpiscissorstool.h"
@ -247,7 +249,7 @@ static gint vert_deriv[9] =
-1, -2, -1, -1, -2, -1,
}; };
static gint blur_32[9] = static gint blur_32[9] =
{ {
1, 1, 1, 1, 1, 1,
1, 24, 1, 1, 24, 1,
@ -278,7 +280,7 @@ gimp_iscissors_tool_register (GimpToolRegisterCallback callback,
_("Select shapes from image"), _("Select shapes from image"),
N_("/Tools/Selection Tools/_Intelligent Scissors"), N_("/Tools/Selection Tools/_Intelligent Scissors"),
"I", "I",
NULL, "tools/iscissors.html", NULL, GIMP_HELP_TOOL_ISCISSORS,
GIMP_STOCK_TOOL_ISCISSORS, GIMP_STOCK_TOOL_ISCISSORS,
data); data);
} }
@ -403,7 +405,7 @@ gimp_iscissors_tool_control (GimpTool *tool,
switch (action) switch (action)
{ {
case PAUSE: case PAUSE:
break; break;
case RESUME: case RESUME:
@ -567,7 +569,7 @@ iscissors_convert (GimpIscissorsTool *iscissors,
iscissors->mask = gimp_scan_convert_to_channel (sc, gdisp->gimage); iscissors->mask = gimp_scan_convert_to_channel (sc, gdisp->gimage);
gimp_scan_convert_free (sc); gimp_scan_convert_free (sc);
gimp_channel_invalidate_bounds (iscissors->mask); gimp_channel_invalidate_bounds (iscissors->mask);
} }
static void static void
@ -716,7 +718,7 @@ gimp_iscissors_tool_motion (GimpTool *tool,
iscissors->x = coords->x; iscissors->x = coords->x;
iscissors->y = coords->y; iscissors->y = coords->y;
switch (iscissors->state) switch (iscissors->state)
{ {
case SEED_PLACEMENT: case SEED_PLACEMENT:
@ -814,7 +816,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
{ {
if (iscissors->livewire->points) if (iscissors->livewire->points)
g_ptr_array_free (iscissors->livewire->points, TRUE); g_ptr_array_free (iscissors->livewire->points, TRUE);
g_free (iscissors->livewire); g_free (iscissors->livewire);
iscissors->livewire = NULL; iscissors->livewire = NULL;
@ -883,7 +885,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
if (iscissors->curve1) if (iscissors->curve1)
{ {
gimp_draw_tool_draw_line (draw_tool, gimp_draw_tool_draw_line (draw_tool,
iscissors->curve1->x2, iscissors->curve1->x2,
iscissors->curve1->y2, iscissors->curve1->y2,
iscissors->nx, iscissors->nx,
iscissors->ny, iscissors->ny,
@ -892,7 +894,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
if (iscissors->curve2) if (iscissors->curve2)
{ {
gimp_draw_tool_draw_line (draw_tool, gimp_draw_tool_draw_line (draw_tool,
iscissors->curve2->x1, iscissors->curve2->x1,
iscissors->curve2->y1, iscissors->curve2->y1,
iscissors->nx, iscissors->nx,
iscissors->ny, iscissors->ny,
@ -1221,7 +1223,7 @@ mouse_over_curve (GimpIscissorsTool *iscissors,
gint tx, ty; gint tx, ty;
/* traverse through the list, returning the curve segment's list element /* 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)) 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 */ x2 = MAX (xs, xe) + 1; /* +1 because if xe = 199 & xs = 0, x2 - x1, width = 200 */
y2 = MAX (ys, ye) + 1; 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: * some percentage of width and height. This serves the following purpose:
* It gives the algorithm more area to search so better solutions * It gives the algorithm more area to search so better solutions
* are found. This is particularly helpful in finding "bumps" which * 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); iscissors->gradient_map = gradient_map_new (gdisp->gimage);
/* allocate the dynamic programming array */ /* allocate the dynamic programming array */
iscissors->dp_buf = iscissors->dp_buf =
temp_buf_resize (iscissors->dp_buf, 4, x1, y1, width, height); temp_buf_resize (iscissors->dp_buf, 4, x1, y1, width, height);
/* find the optimal path of pixels from (x1, y1) to (x2, y2) */ /* find the optimal path of pixels from (x1, y1) to (x2, y2) */
find_optimal_path (iscissors->gradient_map, iscissors->dp_buf, find_optimal_path (iscissors->gradient_map, iscissors->dp_buf,
x1, y1, x2, y2, xs, ys); x1, y1, x2, y2, xs, ys);
/* get a list of the pixels in the optimal path */ /* get a list of the pixels in the optimal path */
curve->points = plot_pixels (iscissors, iscissors->dp_buf, curve->points = plot_pixels (iscissors, iscissors->dp_buf,
x1, y1, xs, ys, xe, ye); x1, y1, xs, ys, xe, ye);
@ -1419,7 +1421,7 @@ calculate_curve (GimpTool *tool,
else if ((x2 - x1) == 0) else if ((x2 - x1) == 0)
{ {
/* plot a vertical line */ /* plot a vertical line */
y = ys; y = ys;
dir = (ys > ye) ? -1 : 1; dir = (ys > ye) ? -1 : 1;
curve->points = g_ptr_array_new (); curve->points = g_ptr_array_new ();
while (y != ye) while (y != ye)
@ -1466,7 +1468,7 @@ gradient_map_value (TileManager *map,
if (!cur_tile) if (!cur_tile)
return FALSE; return FALSE;
cur_tilex = x / TILE_WIDTH; 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); p = tile_data_pointer (cur_tile, x % TILE_WIDTH, y % TILE_HEIGHT);
@ -1509,7 +1511,7 @@ calculate_link (TileManager *gradient_map,
{ {
grad2 = 0; grad2 = 0;
dir2 = 255; dir2 = 255;
} }
value += (direction_value[dir1][link] + direction_value[dir2][link]) * value += (direction_value[dir1][link] + direction_value[dir2][link]) *
OMEGA_D; OMEGA_D;
@ -1668,7 +1670,7 @@ find_optimal_path (TileManager *gradient_map,
/* possibly change the links from the other pixels to this pixel... /* possibly change the links from the other pixels to this pixel...
* these changes occur if a neighboring pixel will receive a lower * 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 ++) for (k = 0; k < 8; k ++)
if (pixel[k] && k != link) 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); d[offset] = (new_cost << 8) + ((k > 3) ? k - 4 : k + 4);
} }
} }
} }
/* Set the seed point */ /* Set the seed point */
else if (!i && !j) else if (!i && !j)
*d = SEED_POINT; *d = SEED_POINT;
@ -1746,7 +1748,7 @@ gradmap_tile_validate (TileManager *tm,
x, y, TRUE, FALSE); x, y, TRUE, FALSE);
if (!srctile) if (!srctile)
return; return;
sw = tile_ewidth (srctile); sw = tile_ewidth (srctile);
sh = tile_eheight (srctile); sh = tile_eheight (srctile);

27
app/tools/gimplevelstool.c
View File

@ -50,6 +50,7 @@
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimphistogramview.h" #include "widgets/gimphistogramview.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -162,7 +163,7 @@ gimp_levels_tool_register (GimpToolRegisterCallback callback,
_("Levels"), _("Levels"),
_("Adjust color levels"), _("Adjust color levels"),
N_("/Tools/Color Tools/_Levels..."), NULL, N_("/Tools/Color Tools/_Levels..."), NULL,
NULL, "tools/levels.html", NULL, GIMP_HELP_TOOL_LEVELS,
GIMP_STOCK_TOOL_LEVELS, GIMP_STOCK_TOOL_LEVELS,
data); data);
} }
@ -188,7 +189,7 @@ gimp_levels_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpLevelsTool", "GimpLevelsTool",
&tool_info, 0); &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), gtk_option_menu_set_history (GTK_OPTION_MENU (l_tool->channel_menu),
l_tool->channel); 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 | LOW_OUTPUT | HIGH_OUTPUT |
DRAW | INPUT_LEVELS | OUTPUT_LEVELS)); DRAW | INPUT_LEVELS | OUTPUT_LEVELS));
@ -767,7 +768,7 @@ levels_update (GimpLevelsTool *l_tool,
{ {
gint i; gint i;
gint sel_channel; gint sel_channel;
if (l_tool->color) if (l_tool->color)
{ {
sel_channel = l_tool->channel; sel_channel = l_tool->channel;
@ -830,7 +831,7 @@ levels_update (GimpLevelsTool *l_tool,
case GIMP_HISTOGRAM_RED: case GIMP_HISTOGRAM_RED:
case GIMP_HISTOGRAM_GREEN: case GIMP_HISTOGRAM_GREEN:
case GIMP_HISTOGRAM_BLUE: case GIMP_HISTOGRAM_BLUE:
for (i = 0; i < DA_WIDTH; i++) for (i = 0; i < DA_WIDTH; i++)
{ {
buf[3 * i + 0] = l_tool->levels->input[GIMP_HISTOGRAM_RED][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) GimpLevelsTool *l_tool)
{ {
GimpHistogramChannel channel = GPOINTER_TO_INT (item_data); GimpHistogramChannel channel = GPOINTER_TO_INT (item_data);
switch (channel) switch (channel)
{ {
case GIMP_HISTOGRAM_VALUE: case GIMP_HISTOGRAM_VALUE:
@ -1003,7 +1004,7 @@ levels_set_sensitive_callback (gpointer item_data,
case GIMP_HISTOGRAM_ALPHA: case GIMP_HISTOGRAM_ALPHA:
return gimp_drawable_has_alpha (GIMP_IMAGE_MAP_TOOL (l_tool)->drawable); return gimp_drawable_has_alpha (GIMP_IMAGE_MAP_TOOL (l_tool)->drawable);
} }
return FALSE; return FALSE;
} }
@ -1116,7 +1117,7 @@ levels_input_picker_toggled (GtkWidget *widget,
return; return;
if (tool->active_picker) 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); FALSE);
tool->active_picker = widget; 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)) if (value & ALL_CHANNELS && GIMP_IMAGE_TYPE_IS_RGB (sample_type))
{ {
GimpHistogramChannel channel; GimpHistogramChannel channel;
/* first reset the value channel */ /* first reset the value channel */
switch (value & 0xF) switch (value & 0xF)
{ {
@ -1426,7 +1427,7 @@ levels_save_callback (GtkWidget *widget,
{ {
if (! l_tool->file_dialog) if (! l_tool->file_dialog)
file_dialog_create (l_tool); file_dialog_create (l_tool);
else if (GTK_WIDGET_VISIBLE (l_tool->file_dialog)) else if (GTK_WIDGET_VISIBLE (l_tool->file_dialog))
return; return;
l_tool->is_save = TRUE; 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 (GIMP_IMAGE_MAP_TOOL (l_tool)->shell));
gtk_window_set_destroy_with_parent (GTK_WINDOW (file_dlg), TRUE); 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), G_CALLBACK (file_dialog_ok_callback),
l_tool); 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), G_CALLBACK (gtk_widget_destroy),
file_dlg); file_dlg);
@ -1517,7 +1518,7 @@ levels_read_from_file (GimpLevelsTool *l_tool,
gdouble gamma[5]; gdouble gamma[5];
gint i, fields; gint i, fields;
gchar buf[50], *nptr; gchar buf[50], *nptr;
if (! fgets (buf, 50, file)) if (! fgets (buf, 50, file))
return FALSE; return FALSE;

7
app/tools/gimpmagnifytool.c
View File

@ -38,6 +38,7 @@
#include "display/gimpdisplayshell-scale.h" #include "display/gimpdisplayshell-scale.h"
#include "widgets/gimpenummenu.h" #include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "gimpmagnifyoptions.h" #include "gimpmagnifyoptions.h"
@ -95,7 +96,7 @@ gimp_magnify_tool_register (GimpToolRegisterCallback callback,
_("Magnify"), _("Magnify"),
_("Zoom in & out"), _("Zoom in & out"),
N_("/Tools/M_agnify"), NULL, N_("/Tools/M_agnify"), NULL,
NULL, "tools/magnify.html", NULL, GIMP_HELP_TOOL_ZOOM,
GIMP_STOCK_TOOL_ZOOM, GIMP_STOCK_TOOL_ZOOM,
data); data);
} }
@ -121,7 +122,7 @@ gimp_magnify_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
"GimpMagnifyTool", "GimpMagnifyTool",
&tool_info, 0); &tool_info, 0);
} }
@ -248,7 +249,7 @@ gimp_magnify_tool_button_release (GimpTool *tool,
win_height = shell->disp_height; win_height = shell->disp_height;
/* we need to compute the mouse movement in screen coordinates */ /* 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)) (SCALEY (shell, h) < options->threshold))
{ {
gimp_display_shell_scale_zoom_fraction (options->zoom_type, gimp_display_shell_scale_zoom_fraction (options->zoom_type,

23
app/tools/gimpmeasuretool.c
View File

@ -43,6 +43,7 @@
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -128,7 +129,7 @@ gimp_measure_tool_register (GimpToolRegisterCallback callback,
_("Measure"), _("Measure"),
_("Measure angles and lengths"), _("Measure angles and lengths"),
N_("/Tools/_Measure"), NULL, N_("/Tools/_Measure"), NULL,
NULL, "tools/measure.html", NULL, GIMP_HELP_TOOL_MEASURE,
GIMP_STOCK_TOOL_MEASURE, GIMP_STOCK_TOOL_MEASURE,
data); data);
} }
@ -154,7 +155,7 @@ gimp_measure_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
"GimpMeasureTool", "GimpMeasureTool",
&tool_info, 0); &tool_info, 0);
} }
@ -237,12 +238,12 @@ gimp_measure_tool_button_press (GimpTool *tool,
shell = GIMP_DISPLAY_SHELL (gdisp->shell); 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) if (gimp_tool_control_is_active (tool->control) && gdisp != tool->gdisp)
{ {
gimp_tool_pop_status (tool); gimp_tool_pop_status (tool);
} }
measure_tool->function = CREATING; measure_tool->function = CREATING;
if (gimp_tool_control_is_active (tool->control) && gdisp == tool->gdisp) 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_hguide;
gboolean create_vguide; gboolean create_vguide;
create_hguide = ((state & GDK_CONTROL_MASK) && create_hguide = ((state & GDK_CONTROL_MASK) &&
(measure_tool->y[i] == (measure_tool->y[i] ==
CLAMP (measure_tool->y[i], CLAMP (measure_tool->y[i],
0, 0,
@ -326,7 +327,7 @@ gimp_measure_tool_button_press (GimpTool *tool,
} }
/* if the function is still CREATING, we are outside the handles */ /* 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)) 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 (measure_tool->function == CREATING)
{ {
if (gimp_tool_control_is_active (tool->control)) if (gimp_tool_control_is_active (tool->control))
@ -378,7 +379,7 @@ gimp_measure_tool_button_press (GimpTool *tool,
const gchar *stock_id; const gchar *stock_id;
stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool->tool_info)); stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool->tool_info));
measure_tool_info = info_dialog_new (NULL, measure_tool_info = info_dialog_new (NULL,
tool->tool_info->blurb, tool->tool_info->blurb,
GIMP_OBJECT (tool->tool_info)->name, GIMP_OBJECT (tool->tool_info)->name,
@ -565,16 +566,16 @@ gimp_measure_tool_motion (GimpTool *tool,
if (shell->dot_for_dot) if (shell->dot_for_dot)
{ {
distance = sqrt (SQR (ax - bx) + SQR (ay - by)); distance = sqrt (SQR (ax - bx) + SQR (ay - by));
if (measure_tool->num_points != 3) if (measure_tool->num_points != 3)
bx = ax > 0 ? 1 : -1; bx = ax > 0 ? 1 : -1;
measure_tool->angle1 = measure_get_angle (ax, ay, 1.0, 1.0); measure_tool->angle1 = measure_get_angle (ax, ay, 1.0, 1.0);
measure_tool->angle2 = measure_get_angle (bx, by, 1.0, 1.0); measure_tool->angle2 = measure_get_angle (bx, by, 1.0, 1.0);
angle = fabs (measure_tool->angle1 - measure_tool->angle2); angle = fabs (measure_tool->angle1 - measure_tool->angle2);
if (angle > 180.0) if (angle > 180.0)
angle = fabs (360.0 - angle); angle = fabs (360.0 - angle);
g_snprintf (status_str, sizeof (status_str), "%.1f %s, %.2f %s", g_snprintf (status_str, sizeof (status_str), "%.1f %s, %.2f %s",
distance, _("pixels"), angle, _("degrees")); distance, _("pixels"), angle, _("degrees"));

5
app/tools/gimpmovetool.c
View File

@ -39,6 +39,7 @@
#include "display/gimpdisplayshell-appearance.h" #include "display/gimpdisplayshell-appearance.h"
#include "display/gimpdisplayshell-transform.h" #include "display/gimpdisplayshell-transform.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "gimpeditselectiontool.h" #include "gimpeditselectiontool.h"
@ -104,7 +105,7 @@ gimp_move_tool_register (GimpToolRegisterCallback callback,
_("Move"), _("Move"),
_("Move layers & selections"), _("Move layers & selections"),
N_("/Tools/Transform Tools/_Move"), "M", N_("/Tools/Transform Tools/_Move"), "M",
NULL, "tools/move.html", NULL, GIMP_HELP_TOOL_MOVE,
GIMP_STOCK_TOOL_MOVE, GIMP_STOCK_TOOL_MOVE,
data); data);
} }
@ -130,7 +131,7 @@ gimp_move_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL, tool_type = g_type_register_static (GIMP_TYPE_DRAW_TOOL,
"GimpMoveTool", "GimpMoveTool",
&tool_info, 0); &tool_info, 0);
} }

4
app/tools/gimppaintbrushtool.c
View File

@ -27,6 +27,8 @@
#include "paint/gimppaintbrush.h" #include "paint/gimppaintbrush.h"
#include "paint/gimppaintoptions.h" #include "paint/gimppaintoptions.h"
#include "widgets/gimphelp-ids.h"
#include "gimppaintbrushtool.h" #include "gimppaintbrushtool.h"
#include "gimppaintoptions-gui.h" #include "gimppaintoptions-gui.h"
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
@ -56,7 +58,7 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback callback,
_("Paintbrush"), _("Paintbrush"),
_("Paint fuzzy brush strokes"), _("Paint fuzzy brush strokes"),
N_("/Tools/Paint Tools/_Paintbrush"), "P", N_("/Tools/Paint Tools/_Paintbrush"), "P",
NULL, "tools/paintbrush.html", NULL, GIMP_HELP_TOOL_PAINTBRUSH,
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH,
data); data);
} }

4
app/tools/gimppenciltool.c
View File

@ -27,6 +27,8 @@
#include "paint/gimppencil.h" #include "paint/gimppencil.h"
#include "paint/gimppenciloptions.h" #include "paint/gimppenciloptions.h"
#include "widgets/gimphelp-ids.h"
#include "gimppenciltool.h" #include "gimppenciltool.h"
#include "gimppaintoptions-gui.h" #include "gimppaintoptions-gui.h"
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
@ -55,7 +57,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback callback,
_("Pencil"), _("Pencil"),
_("Paint hard edged pixels"), _("Paint hard edged pixels"),
N_("/Tools/Paint Tools/Pe_ncil"), "N", N_("/Tools/Paint Tools/Pe_ncil"), "N",
NULL, "tools/pencil.html", NULL, GIMP_HELP_TOOL_PENCIL,
GIMP_STOCK_TOOL_PENCIL, GIMP_STOCK_TOOL_PENCIL,
data); data);
} }

19
app/tools/gimpperspectivetool.c
View File

@ -25,18 +25,19 @@
#include "tools-types.h" #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/gimpimage.h"
#include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable-transform-utils.h" #include "core/gimpdrawable-transform-utils.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.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 "gui/info-dialog.h"
#include "gimpperspectivetool.h" #include "gimpperspectivetool.h"
@ -70,7 +71,7 @@ static GimpTransformToolClass *parent_class = NULL;
/* public functions */ /* public functions */
void void
gimp_perspective_tool_register (GimpToolRegisterCallback callback, gimp_perspective_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
@ -82,7 +83,7 @@ gimp_perspective_tool_register (GimpToolRegisterCallback callback,
_("Perspective"), _("Perspective"),
_("Change perspective of the layer or selection"), _("Change perspective of the layer or selection"),
N_("/Tools/Transform Tools/_Perspective"), "<shift>P", N_("/Tools/Transform Tools/_Perspective"), "<shift>P",
NULL, "tools/perspective.html", NULL, GIMP_HELP_TOOL_PERSPECTIVE,
GIMP_STOCK_TOOL_PERSPECTIVE, GIMP_STOCK_TOOL_PERSPECTIVE,
data); data);
} }
@ -108,7 +109,7 @@ gimp_perspective_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
"GimpPerspectiveTool", "GimpPerspectiveTool",
&tool_info, 0); &tool_info, 0);
} }
@ -243,7 +244,7 @@ static void
perspective_info_update (GimpTransformTool *tr_tool) perspective_info_update (GimpTransformTool *tr_tool)
{ {
gint i; gint i;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
gchar *p = matrix_row_buf[i]; gchar *p = matrix_row_buf[i];

8
app/tools/gimpposterizetool.c
View File

@ -23,7 +23,7 @@
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "tools-types.h" #include "tools-types.h"
#include "base/gimplut.h" #include "base/gimplut.h"
#include "base/lut-funcs.h" #include "base/lut-funcs.h"
@ -31,6 +31,8 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "gimpposterizetool.h" #include "gimpposterizetool.h"
@ -75,7 +77,7 @@ gimp_posterize_tool_register (GimpToolRegisterCallback callback,
_("Posterize"), _("Posterize"),
_("Reduce image to a fixed number of colors"), _("Reduce image to a fixed number of colors"),
N_("/Tools/Color Tools/_Posterize..."), NULL, N_("/Tools/Color Tools/_Posterize..."), NULL,
NULL, "tools/posterize.html", NULL, GIMP_HELP_TOOL_POSTERIZE,
GIMP_STOCK_TOOL_POSTERIZE, GIMP_STOCK_TOOL_POSTERIZE,
data); data);
} }
@ -101,7 +103,7 @@ gimp_posterize_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpPosterizeTool", "GimpPosterizeTool",
&tool_info, 0); &tool_info, 0);
} }

12
app/tools/gimprectselecttool.c
View File

@ -37,6 +37,8 @@
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
@ -95,7 +97,7 @@ gimp_rect_select_tool_register (GimpToolRegisterCallback callback,
_("Rect Select"), _("Rect Select"),
_("Select rectangular regions"), _("Select rectangular regions"),
N_("/Tools/Selection Tools/_Rect Select"), "R", N_("/Tools/Selection Tools/_Rect Select"), "R",
NULL, "tools/rect_select.html", NULL, GIMP_HELP_TOOL_RECT_SELECT,
GIMP_STOCK_TOOL_RECT_SELECT, GIMP_STOCK_TOOL_RECT_SELECT,
data); data);
} }
@ -121,7 +123,7 @@ gimp_rect_select_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL,
"GimpRectSelectTool", "GimpRectSelectTool",
&tool_info, 0); &tool_info, 0);
} }
@ -389,7 +391,7 @@ gimp_rect_select_tool_motion (GimpTool *tool,
if ((th < 0 && h > 0) || (th > 0 && h < 0)) if ((th < 0 && h > 0) || (th > 0 && h < 0))
h = -h; h = -h;
} }
else else
{ {
h = th; h = th;
w = (gint) (th / ratio); 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, GIMP_RECT_SELECT_TOOL_GET_CLASS (rect_tool)->rect_select (rect_tool,
x, y, w, h); x, y, w, h);
} }
static void static void
gimp_rect_select_tool_update_options (GimpRectSelectTool *rect_sel, gimp_rect_select_tool_update_options (GimpRectSelectTool *rect_sel,
GimpDisplay *gdisp) GimpDisplay *gdisp)
@ -606,7 +608,7 @@ gimp_rect_select_tool_update_options (GimpRectSelectTool *rect_sel,
{ {
GimpImage *gimage; GimpImage *gimage;
gdouble unit_factor; gdouble unit_factor;
gimage = gdisp->gimage; gimage = gdisp->gimage;
unit = gimage->unit; unit = gimage->unit;

4
app/tools/gimpregionselecttool.c
View File

@ -39,6 +39,8 @@
#include "core/gimplayer-floating-sel.h" #include "core/gimplayer-floating-sel.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h" #include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-cursor.h" #include "display/gimpdisplayshell-cursor.h"
@ -98,7 +100,7 @@ gimp_fuzzy_select_tool_register (GimpToolRegisterCallback callback,
_("Fuzzy Select"), _("Fuzzy Select"),
_("Select contiguous regions"), _("Select contiguous regions"),
N_("/Tools/Selection Tools/Fu_zzy Select"), "Z", N_("/Tools/Selection Tools/Fu_zzy Select"), "Z",
NULL, "tools/fuzzy_select.html", NULL, GIMP_HELP_TOOL_FUZZY_SELECT,
GIMP_STOCK_TOOL_FUZZY_SELECT, GIMP_STOCK_TOOL_FUZZY_SELECT,
data); data);
} }

21
app/tools/gimprotatetool.c
View File

@ -25,21 +25,20 @@
#include "tools-types.h" #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/gimpimage.h"
#include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable-transform-utils.h" #include "core/gimpdrawable-transform-utils.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.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 "gui/info-dialog.h"
#include "gimprotatetool.h" #include "gimprotatetool.h"
@ -92,7 +91,7 @@ static GimpTransformToolClass *parent_class = NULL;
/* public functions */ /* public functions */
void void
gimp_rotate_tool_register (GimpToolRegisterCallback callback, gimp_rotate_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
@ -104,7 +103,7 @@ gimp_rotate_tool_register (GimpToolRegisterCallback callback,
_("Rotate"), _("Rotate"),
_("Rotate the layer or selection"), _("Rotate the layer or selection"),
N_("/Tools/Transform Tools/_Rotate"), "<shift>R", N_("/Tools/Transform Tools/_Rotate"), "<shift>R",
NULL, "tools/rotate.html", NULL, GIMP_HELP_TOOL_ROTATE,
GIMP_STOCK_TOOL_ROTATE, GIMP_STOCK_TOOL_ROTATE,
data); data);
} }
@ -130,7 +129,7 @@ gimp_rotate_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
"GimpRotateTool", "GimpRotateTool",
&tool_info, 0); &tool_info, 0);
} }
@ -222,7 +221,7 @@ gimp_rotate_tool_prepare (GimpTransformTool *tr_tool,
center_vals[0] = tr_tool->cx; center_vals[0] = tr_tool->cx;
center_vals[1] = tr_tool->cy; center_vals[1] = tr_tool->cy;
g_signal_handlers_block_by_func (sizeentry, g_signal_handlers_block_by_func (sizeentry,
rotate_center_changed, rotate_center_changed,
tr_tool); tr_tool);
@ -254,7 +253,7 @@ gimp_rotate_tool_prepare (GimpTransformTool *tr_tool,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
center_vals[1]); center_vals[1]);
g_signal_handlers_unblock_by_func (sizeentry, g_signal_handlers_unblock_by_func (sizeentry,
rotate_center_changed, rotate_center_changed,
tr_tool); tr_tool);

27
app/tools/gimpscaletool.c
View File

@ -26,19 +26,20 @@
#include "tools-types.h" #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/gimpimage.h"
#include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable-transform-utils.h" #include "core/gimpdrawable-transform-utils.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.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 "gui/info-dialog.h"
#include "gimpscaletool.h" #include "gimpscaletool.h"
@ -97,7 +98,7 @@ gimp_scale_tool_register (GimpToolRegisterCallback callback,
_("Scale"), _("Scale"),
_("Scale the layer or selection"), _("Scale the layer or selection"),
N_("/Tools/Transform Tools/_Scale"), "<shift>T", N_("/Tools/Transform Tools/_Scale"), "<shift>T",
NULL, "tools/transform.html", NULL, GIMP_HELP_TOOL_SCALE,
GIMP_STOCK_TOOL_SCALE, GIMP_STOCK_TOOL_SCALE,
data); data);
} }
@ -123,7 +124,7 @@ gimp_scale_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
"GimpScaleTool", "GimpScaleTool",
&tool_info, 0); &tool_info, 0);
} }
@ -195,7 +196,7 @@ gimp_scale_tool_dialog (GimpTransformTool *tr_tool)
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry), gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry),
GTK_SPIN_BUTTON (spinbutton), NULL); GTK_SPIN_BUTTON (spinbutton), NULL);
info_dialog_add_label (tr_tool->info_dialog, info_dialog_add_label (tr_tool->info_dialog,
_("Scale Ratio X:"), _("Scale Ratio X:"),
x_ratio_buf); x_ratio_buf);
info_dialog_add_label (tr_tool->info_dialog, 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[0] = tr_tool->x2 - tr_tool->x1;
size_vals[1] = tr_tool->y2 - tr_tool->y1; 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, gimp_scale_tool_size_changed,
tr_tool); tr_tool);
g_signal_handlers_block_by_func (sizeentry, g_signal_handlers_block_by_func (sizeentry,
gimp_scale_tool_unit_changed, gimp_scale_tool_unit_changed,
tr_tool); tr_tool);
@ -250,10 +251,10 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
size_vals[1]); size_vals[1]);
g_signal_handlers_unblock_by_func (sizeentry, g_signal_handlers_unblock_by_func (sizeentry,
gimp_scale_tool_size_changed, gimp_scale_tool_size_changed,
tr_tool); tr_tool);
g_signal_handlers_unblock_by_func (sizeentry, g_signal_handlers_unblock_by_func (sizeentry,
gimp_scale_tool_unit_changed, gimp_scale_tool_unit_changed,
tr_tool); tr_tool);
@ -366,7 +367,7 @@ gimp_scale_tool_motion (GimpTransformTool *tr_tool,
} }
/* if both the control key & mod1 keys are down, /* 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) if (options->constrain_1 && options->constrain_2)
{ {

17
app/tools/gimpsheartool.c
View File

@ -27,18 +27,19 @@
#include "tools-types.h" #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/gimpimage.h"
#include "core/gimpdrawable-transform.h" #include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable-transform-utils.h" #include "core/gimpdrawable-transform-utils.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.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 "gui/info-dialog.h"
#include "gimpsheartool.h" #include "gimpsheartool.h"
@ -87,7 +88,7 @@ static GimpTransformToolClass *parent_class = NULL;
/* Public functions */ /* Public functions */
void void
gimp_shear_tool_register (GimpToolRegisterCallback callback, gimp_shear_tool_register (GimpToolRegisterCallback callback,
gpointer data) gpointer data)
{ {
@ -99,7 +100,7 @@ gimp_shear_tool_register (GimpToolRegisterCallback callback,
_("Shear"), _("Shear"),
_("Shear the layer or selection"), _("Shear the layer or selection"),
N_("/Tools/Transform Tools/S_hear"), "<shift>S", N_("/Tools/Transform Tools/S_hear"), "<shift>S",
NULL, "tools/shear.html", NULL, GIMP_HELP_TOOL_SHEAR,
GIMP_STOCK_TOOL_SHEAR, GIMP_STOCK_TOOL_SHEAR,
data); data);
} }
@ -125,7 +126,7 @@ gimp_shear_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL, tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
"GimpShearTool", "GimpShearTool",
&tool_info, 0); &tool_info, 0);
} }

3
app/tools/gimpsmudgetool.c
View File

@ -29,6 +29,7 @@
#include "paint/gimpsmudge.h" #include "paint/gimpsmudge.h"
#include "paint/gimpsmudgeoptions.h" #include "paint/gimpsmudgeoptions.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "gimpsmudgetool.h" #include "gimpsmudgetool.h"
@ -61,7 +62,7 @@ gimp_smudge_tool_register (GimpToolRegisterCallback callback,
_("Smudge"), _("Smudge"),
_("Smudge image"), _("Smudge image"),
N_("/Tools/Paint Tools/_Smudge"), "S", N_("/Tools/Paint Tools/_Smudge"), "S",
NULL, "tools/smudge.html", NULL, GIMP_HELP_TOOL_SMUDGE,
GIMP_STOCK_TOOL_SMUDGE, GIMP_STOCK_TOOL_SMUDGE,
data); data);
} }

7
app/tools/gimpsourcetool.c
View File

@ -32,10 +32,11 @@
#include "paint/gimpclone.h" #include "paint/gimpclone.h"
#include "paint/gimpcloneoptions.h" #include "paint/gimpcloneoptions.h"
#include "display/gimpdisplay.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "display/gimpdisplay.h"
#include "gimpclonetool.h" #include "gimpclonetool.h"
#include "gimppaintoptions-gui.h" #include "gimppaintoptions-gui.h"
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
@ -98,7 +99,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback callback,
_("Clone"), _("Clone"),
_("Paint using Patterns or Image Regions"), _("Paint using Patterns or Image Regions"),
N_("/Tools/Paint Tools/_Clone"), "C", N_("/Tools/Paint Tools/_Clone"), "C",
NULL, "tools/clone.html", NULL, GIMP_HELP_TOOL_CLONE,
GIMP_STOCK_TOOL_CLONE, GIMP_STOCK_TOOL_CLONE,
data); data);
} }

3
app/tools/gimptexttool.c
View File

@ -45,6 +45,7 @@
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimpfontselection.h" #include "widgets/gimpfontselection.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
@ -114,7 +115,7 @@ gimp_text_tool_register (GimpToolRegisterCallback callback,
_("Text"), _("Text"),
_("Add text to the image"), _("Add text to the image"),
N_("/Tools/Te_xt"), "T", N_("/Tools/Te_xt"), "T",
NULL, "tools/text.html", NULL, GIMP_HELP_TOOL_TEXT,
GIMP_STOCK_TOOL_TEXT, GIMP_STOCK_TOOL_TEXT,
data); data);
} }

5
app/tools/gimpthresholdtool.c
View File

@ -36,6 +36,7 @@
#include "core/gimpimagemap.h" #include "core/gimpimagemap.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimphistogrambox.h" #include "widgets/gimphistogrambox.h"
#include "widgets/gimphistogramview.h" #include "widgets/gimphistogramview.h"
@ -88,7 +89,7 @@ gimp_threshold_tool_register (GimpToolRegisterCallback callback,
_("Threshold"), _("Threshold"),
_("Reduce image to two colors using a threshold"), _("Reduce image to two colors using a threshold"),
N_("/Tools/Color Tools/_Threshold..."), NULL, N_("/Tools/Color Tools/_Threshold..."), NULL,
NULL, "tools/threshold.html", NULL, GIMP_HELP_TOOL_THRESHOLD,
GIMP_STOCK_TOOL_THRESHOLD, GIMP_STOCK_TOOL_THRESHOLD,
data); data);
} }
@ -114,7 +115,7 @@ gimp_threshold_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL, tool_type = g_type_register_static (GIMP_TYPE_IMAGE_MAP_TOOL,
"GimpThresholdTool", "GimpThresholdTool",
&tool_info, 0); &tool_info, 0);
} }

32
app/tools/gimpvectortool.c
View File

@ -41,6 +41,8 @@
#include "vectors/gimpvectors.h" #include "vectors/gimpvectors.h"
#include "vectors/gimpbezierstroke.h" #include "vectors/gimpbezierstroke.h"
#include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h" #include "display/gimpdisplay-foreach.h"
@ -125,7 +127,7 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback,
_("Paths"), _("Paths"),
_("Create and edit paths"), _("Create and edit paths"),
N_("/Tools/_Paths"), NULL, N_("/Tools/_Paths"), NULL,
NULL, "tools/paths.html", NULL, GIMP_HELP_TOOL_PATH,
GIMP_STOCK_TOOL_PATH, GIMP_STOCK_TOOL_PATH,
data); data);
} }
@ -151,7 +153,7 @@ gimp_vector_tool_get_type (void)
}; };
tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL, tool_type = g_type_register_static (GIMP_TYPE_SELECTION_TOOL,
"GimpVectorTool", "GimpVectorTool",
&tool_info, 0); &tool_info, 0);
} }
@ -189,7 +191,7 @@ gimp_vector_tool_init (GimpVectorTool *vector_tool)
tool = GIMP_TOOL (vector_tool); tool = GIMP_TOOL (vector_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE); gimp_tool_control_set_scroll_lock (tool->control, TRUE);
vector_tool->function = VECTORS_CREATE_VECTOR; vector_tool->function = VECTORS_CREATE_VECTOR;
vector_tool->last_x = 0; vector_tool->last_x = 0;
vector_tool->last_y = 0; vector_tool->last_y = 0;
@ -253,19 +255,19 @@ gimp_vector_tool_button_press (GimpTool *tool,
/* when pressing mouse down /* when pressing mouse down
* *
* Anchor: (NONE) -> Regular Movement * Anchor: (NONE) -> Regular Movement
* (SHFT) -> multiple selection * (SHFT) -> multiple selection
* (CTRL) -> Drag out control point * (CTRL) -> Drag out control point
* (CTRL+SHFT) -> Convert to corner * (CTRL+SHFT) -> Convert to corner
* (ALT) -> close this stroke (really should be able to connect * (ALT) -> close this stroke (really should be able to connect
* two strokes) * two strokes)
* *
* Handle: (NONE) -> Regular Movement * Handle: (NONE) -> Regular Movement
* (SHFT) -> (Handle) Move opposite handle symmetrically * (SHFT) -> (Handle) Move opposite handle symmetrically
* (CTRL+SHFT) -> move handle to its anchor * (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) if (gdisp != tool->gdisp)
{ {
/* gimp_tool_pop_status (tool); */ /* gimp_tool_pop_status (tool); */
@ -336,7 +338,7 @@ gimp_vector_tool_button_press (GimpTool *tool,
vector_tool->cur_anchor = NULL; vector_tool->cur_anchor = NULL;
vector_tool->function = VECTORS_FINISHED; vector_tool->function = VECTORS_FINISHED;
} }
break; break;
case VECTORS_DELETE_SEGMENT: case VECTORS_DELETE_SEGMENT:
@ -420,7 +422,7 @@ gimp_vector_tool_button_press (GimpTool *tool,
{ {
gimp_vectors_anchor_select (vector_tool->vectors, stroke, gimp_vectors_anchor_select (vector_tool->vectors, stroke,
anchor, TRUE); anchor, TRUE);
/* if the selected anchor changed, the visible control /* if the selected anchor changed, the visible control
* points might have changed too */ * points might have changed too */
if (vector_tool->function == VECTORS_MOVE_HANDLE) 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_stroke = stroke;
vector_tool->cur_anchor = anchor; vector_tool->cur_anchor = anchor;
break; /* here it is... :-) */ break; /* here it is... :-) */
case VECTORS_CONVERT_EDGE: case VECTORS_CONVERT_EDGE:
if (gimp_vector_tool_on_handle (tool, coords, if (gimp_vector_tool_on_handle (tool, coords,
GIMP_ANCHOR_ANCHOR, gdisp, GIMP_ANCHOR_ANCHOR, gdisp,
@ -463,7 +465,7 @@ gimp_vector_tool_button_press (GimpTool *tool,
vector_tool->function = VECTORS_FINISHED; vector_tool->function = VECTORS_FINISHED;
} }
} }
break; break;
default: default:
@ -668,7 +670,7 @@ gimp_vector_tool_on_handle (GimpTool *tool,
{ {
if (ret_anchor) if (ret_anchor)
*ret_anchor = anchor; *ret_anchor = anchor;
/* *ret_stroke already set correctly. */ /* *ret_stroke already set correctly. */
return TRUE; return TRUE;
} }
@ -804,7 +806,7 @@ gimp_vector_tool_oper_update (GimpTool *tool,
} }
} }
} }
else else
{ {
vector_tool->function = VECTORS_MOVE_ANCHOR; vector_tool->function = VECTORS_MOVE_ANCHOR;
} }
@ -979,7 +981,7 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool)
/* the lines to the control handles */ /* the lines to the control handles */
coords = gimp_stroke_get_draw_lines (cur_stroke); coords = gimp_stroke_get_draw_lines (cur_stroke);
if (coords->len % 2 == 0) if (coords->len % 2 == 0)
{ {
gint i; gint i;
@ -1089,7 +1091,7 @@ gimp_vector_tool_set_vectors (GimpVectorTool *vector_tool,
g_object_ref (vectors); g_object_ref (vectors);
g_signal_connect_object (vectors, "removed", g_signal_connect_object (vectors, "removed",
G_CALLBACK (gimp_vector_tool_clear_vectors), G_CALLBACK (gimp_vector_tool_clear_vectors),
vector_tool, vector_tool,
G_CONNECT_SWAPPED); G_CONNECT_SWAPPED);

7
app/widgets/gimperrorconsole.c
View File

@ -56,6 +56,7 @@
#include "core/gimp.h" #include "core/gimp.h"
#include "gimperrorconsole.h" #include "gimperrorconsole.h"
#include "gimphelp-ids.h"
#include "gimpitemfactory.h" #include "gimpitemfactory.h"
#include "gimpmenufactory.h" #include "gimpmenufactory.h"
#include "gimpwidgets-utils.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), G_CALLBACK (gimp_error_console_save_ok_clicked),
console); console);
/* Connect the "F1" help key */ gimp_help_connect (GTK_WIDGET (filesel), gimp_standard_help_func,
gimp_help_connect (GTK_WIDGET (filesel), GIMP_HELP_ERROR_DIALOG);
gimp_standard_help_func,
"dialogs/error_console.html");
gtk_widget_show (GTK_WIDGET (filesel)); gtk_widget_show (GTK_WIDGET (filesel));
} }

477
app/widgets/gimphelp-ids.h
View File

@ -23,235 +23,294 @@
#define __GIMP_HELP_IDS_H__ #define __GIMP_HELP_IDS_H__
#define GIMP_HELP_FILE_NEW "file/dialogs/file_new.html" #define GIMP_HELP_FILE_NEW "dialogs/file_new.html"
#define GIMP_HELP_FILE_NEW_CONFIRM "file/dialogs/file_new.html#confirm_dialog" #define GIMP_HELP_FILE_NEW_CONFIRM "dialogs/file_new.html#confirm_dialog"
#define GIMP_HELP_FILE_OPEN "file/dialogs/file_open.html" #define GIMP_HELP_FILE_OPEN "dialogs/file_open.html"
#define GIMP_HELP_FILE_SAVE "file/dialogs/file_save.html" #define GIMP_HELP_FILE_OPEN_BY_EXTENSION "file/open_by_extension.html"
#define GIMP_HELP_FILE_SAVE_AS "file/dialogs/file_save.html" #define GIMP_HELP_FILE_OPEN_RECENT "file/last_opened.html"
#define GIMP_HELP_FILE_SAVE_A_COPY "file/dialogs/file_save.html" #define GIMP_HELP_FILE_SAVE "dialogs/file_save.html"
#define GIMP_HELP_FILE_SAVE_AS_TEMPLATE "file/dialogs/file_save.html" #define GIMP_HELP_FILE_SAVE_AS "dialogs/file_save.html"
#define GIMP_HELP_FILE_SAVE_OVERWRITE "file/dialogs/file_exists.html" #define GIMP_HELP_FILE_SAVE_A_COPY "dialogs/file_save.html"
#define GIMP_HELP_FILE_REVERT "file/revert.html" #define GIMP_HELP_FILE_SAVE_AS_TEMPLATE "dialogs/file_save.html"
#define GIMP_HELP_FILE_CLOSE "file/close.html" #define GIMP_HELP_FILE_SAVE_BY_EXTENSION "file/save_by_extension.html"
#define GIMP_HELP_FILE_QUIT "file/quit.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_UNDO "edit/undo.html"
#define GIMP_HELP_EDIT_REDO "edit/redo.html" #define GIMP_HELP_EDIT_REDO "edit/redo.html"
#define GIMP_HELP_EDIT_CUT "edit/cut.html" #define GIMP_HELP_EDIT_CUT "edit/cut.html"
#define GIMP_HELP_EDIT_COPY "edit/copy.html" #define GIMP_HELP_EDIT_COPY "edit/copy.html"
#define GIMP_HELP_EDIT_PASTE "edit/paste.html" #define GIMP_HELP_EDIT_PASTE "edit/paste.html"
#define GIMP_HELP_EDIT_PASTE_INTO "edit/paste_into.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_PASTE_AS_NEW "edit/paste_as_new.html"
#define GIMP_HELP_EDIT_CLEAR "edit/clear.html" #define GIMP_HELP_EDIT_CLEAR "edit/clear.html"
#define GIMP_HELP_EDIT_FILL_FG "edit/fill.html" #define GIMP_HELP_EDIT_FILL_FG "edit/fill.html"
#define GIMP_HELP_EDIT_FILL_BG "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_FILL_PATTERN "edit/fill.html"
#define GIMP_HELP_EDIT_STROKE_SELECTION "edit/stroke.html" #define GIMP_HELP_EDIT_STROKE_SELECTION "edit/stroke.html"
#define GIMP_HELP_EDIT_STROKE_PATH "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_DIALOG "dialogs/selection_editor.html"
#define GIMP_HELP_SELECT_ALL "select/all.html" #define GIMP_HELP_SELECT_ALL "select/all.html"
#define GIMP_HELP_SELECT_NONE "select/none.html" #define GIMP_HELP_SELECT_NONE "select/none.html"
#define GIMP_HELP_SELECT_INVERT "select/invert.html" #define GIMP_HELP_SELECT_INVERT "select/invert.html"
#define GIMP_HELP_SELECT_FLOAT "select/float.html" #define GIMP_HELP_SELECT_FLOAT "select/float.html"
#define GIMP_HELP_SELECT_FEATHER "select/dialogs/feather_selection.html" #define GIMP_HELP_SELECT_FEATHER "dialogs/feather_selection.html"
#define GIMP_HELP_SELECT_SHARPEN "select/sharpen.html" #define GIMP_HELP_SELECT_SHARPEN "select/sharpen.html"
#define GIMP_HELP_SELECT_SHRINK "select/dialogs/shrink_selection.html" #define GIMP_HELP_SELECT_SHRINK "dialogs/shrink_selection.html"
#define GIMP_HELP_SELECT_GROW "select/dialogs/grow_selection.html" #define GIMP_HELP_SELECT_GROW "dialogs/grow_selection.html"
#define GIMP_HELP_SELECT_BORDER "select/dialogs/border_selection.html" #define GIMP_HELP_SELECT_BORDER "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_SAVE_TO_CHANNEL "select/save_to_channel.html"
#define GIMP_HELP_VIEW_NEW "view/new.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_DOT_FOR_DOT "view/dot_for_dot.html"
#define GIMP_HELP_VIEW_ZOOM "view/zoom.html" #define GIMP_HELP_VIEW_ZOOM "view/zoom.html"
#define GIMP_HELP_VIEW_ZOOM_TO_FIT "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_SELECTION "view/toggle_selection.html"
#define GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY "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_SHOW_GUIDES "view/toggle_guides.html"
#define GIMP_HELP_VIEW_SNAP_TO_GUIDES "view/gnap_to_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_SHOW_GRID "view/toggle_grid.html"
#define GIMP_HELP_VIEW_SNAP_TO_GRID "view/snap_to_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_MENUBAR "view/toggle_menubar.html"
#define GIMP_HELP_VIEW_SHOW_RULERS "view/toggle_rulers.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_SCROLLBARS "view/toggle_scrollbars.html"
#define GIMP_HELP_VIEW_SHOW_STATUSBAR "view/toggle_statusbar.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_SHRINK_WRAP "view/shrink_wrap.html"
#define GIMP_HELP_VIEW_FULLSCREEN "view/fullscreen.html" #define GIMP_HELP_VIEW_FULLSCREEN "view/fullscreen.html"
#define GIMP_HELP_IMAGE_DIALOG "dialogs/image_dialog.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_RGB "image/mode/convert_to_rgb.html"
#define GIMP_HELP_IMAGE_CONVERT_GRAYSCALE "image/mode/convert_to_grayscale.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_CONVERT_INDEXED "image/mode/convert_to_indexed.html"
#define GIMP_HELP_IMAGE_FLIP_HORIZONTAL "image/dialogs/flip_image.html" #define GIMP_HELP_IMAGE_FLIP_HORIZONTAL "dialogs/flip_image.html"
#define GIMP_HELP_IMAGE_FLIP_VERTICAL "image/dialogs/flip_image.html" #define GIMP_HELP_IMAGE_FLIP_VERTICAL "dialogs/flip_image.html"
#define GIMP_HELP_IMAGE_ROTATE_90 "image/dialogs/rotate_image.html" #define GIMP_HELP_IMAGE_ROTATE_90 "dialogs/rotate_image.html"
#define GIMP_HELP_IMAGE_ROTATE_180 "image/dialogs/rotate_image.html" #define GIMP_HELP_IMAGE_ROTATE_180 "dialogs/rotate_image.html"
#define GIMP_HELP_IMAGE_ROTATE_270 "image/dialogs/rotate_image.html" #define GIMP_HELP_IMAGE_ROTATE_270 "dialogs/rotate_image.html"
#define GIMP_HELP_IMAGE_RESIZE "image/dialogs/set_canvas_size.html" #define GIMP_HELP_IMAGE_RESIZE "dialogs/set_canvas_size.html"
#define GIMP_HELP_IMAGE_SCALE "image/dialogs/scale_image.html" #define GIMP_HELP_IMAGE_SCALE "dialogs/scale_image.html"
#define GIMP_HELP_IMAGE_CROP "image/dialogs/crop_image.html" #define GIMP_HELP_IMAGE_SCALE_WARNING "dialogs/scale_image.html"
#define GIMP_HELP_IMAGE_DUPLICATE "image/duplicate.html" #define GIMP_HELP_IMAGE_CROP "dialogs/crop_image.html"
#define GIMP_HELP_IMAGE_MERGE_LAYERS "layers/dialogs/merge_visible_layers.html" #define GIMP_HELP_IMAGE_DUPLICATE "image/duplicate.html"
#define GIMP_HELP_IMAGE_FLATTEN "layers/flatten_image.html" #define GIMP_HELP_IMAGE_MERGE_LAYERS "/dialogs/merge_visible_layers.html"
#define GIMP_HELP_IMAGE_GRID "image/dialogs/configure_grid.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_DIALOG "/dialogs/layers_dialog.html"
#define GIMP_HELP_LAYER_NEW "layers/dialogs/new_layer.html" #define GIMP_HELP_LAYER_NEW "/dialogs/new_layer.html"
#define GIMP_HELP_LAYER_DUPLICATE "layers/duplicate_layer.html" #define GIMP_HELP_LAYER_DUPLICATE "layers/duplicate_layer.html"
#define GIMP_HELP_LAYER_ANCHOR "layers/anchor_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_MERGE_DOWN "layers/merge_down.html"
#define GIMP_HELP_LAYER_DELETE "layers/delete_layer.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_PREVIOUS "layers/stack/stack.html#previous_layer"
#define GIMP_HELP_LAYER_NEXT "layers/stack/stack.html#next_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_TOP "layers/stack/stack.html#previous_layer"
#define GIMP_HELP_LAYER_BOTTOM "layers/stack/stack.html#next_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_RAISE "layers/stack/stack.html#raise_layer"
#define GIMP_HELP_LAYER_LOWER "layers/stack/stack.html#lower_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_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_LOWER_TO_BOTTOM "layers/stack/stack.html#layer_to_bottom"
#define GIMP_HELP_LAYER_DESATURATE "layers/colors/desaturate.html" #define GIMP_HELP_LAYER_DESATURATE "layers/colors/desaturate.html"
#define GIMP_HELP_LAYER_INVERT "layers/colors/invert.html" #define GIMP_HELP_LAYER_INVERT "layers/colors/invert.html"
#define GIMP_HELP_LAYER_EQUALIZE "layers/colors/auto/equalize.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_ADD "dialogs/add_layer_mask.html"
#define GIMP_HELP_LAYER_MASK_APPLY "layers/apply_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_DELETE "layers/delete_mask.html"
#define GIMP_HELP_LAYER_MASK_SEL_REPLACE "layers/mask_to_selection.html" #define GIMP_HELP_LAYER_MASK_SELECTION_REPLACE "layers/mask_to_selection.html"
#define GIMP_HELP_LAYER_MASK_SEL_ADD "layers/mask_to_selection.html#add" #define GIMP_HELP_LAYER_MASK_SELECTION_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_SELECTION_SUBTRACT "layers/mask_to_selection.html#subtract"
#define GIMP_HELP_LAYER_MASK_SEL_INTERSECT "layers/mask_to_selection.html#intersect" #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_ADD "layers/add_alpha_channel.html"
#define GIMP_HELP_LAYER_ALPHA_SEL_REPLACE "layers/alpha_to_selection.html" #define GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE "layers/alpha_to_selection.html"
#define GIMP_HELP_LAYER_ALPHA_SEL_ADD "layers/alpha_to_selection.html#add" #define GIMP_HELP_LAYER_ALPHA_SELECTION_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_SELECTION_SUBTRACT "layers/alpha_to_selection.html#subtract"
#define GIMP_HELP_LAYER_ALPHA_SEL_INTERSECT "layers/alpha_to_selection.html#intersect" #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_HORIZONTAL "layers/flip_layer.html"
#define GIMP_HELP_LAYER_FLIP_VERTICAL "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_90 "layers/rotate_layer.html"
#define GIMP_HELP_LAYER_ROTATE_180 "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_ROTATE_270 "layers/rotate_layer.html"
#define GIMP_HELP_LAYER_OFFSET "layers/dialogs/offset.html" #define GIMP_HELP_LAYER_OFFSET "dialogs/offset.html"
#define GIMP_HELP_LAYER_RESIZE "layers/dialogs/layer_boundary_size.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_RESIZE_TO_IMAGE "layers/layer_to_image_size.html"
#define GIMP_HELP_LAYER_SCALE "layers/dialogs/scale_layer.html" #define GIMP_HELP_LAYER_SCALE "dialogs/scale_layer.html"
#define GIMP_HELP_LAYER_CROP "layers/dialogs/crop_layer.html" #define GIMP_HELP_LAYER_CROP "dialogs/crop_layer.html"
#define GIMP_HELP_LAYER_EDIT "layers/dialogs/edit_layer_attributes.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_DIALOG "dialogs/channels_dialog.html"
#define GIMP_HELP_CHANNEL_NEW "channels/dialogs/new_channel.html" #define GIMP_HELP_CHANNEL_NEW "dialogs/new_channel.html"
#define GIMP_HELP_CHANNEL_RAISE "channels/raise_channel.html" #define GIMP_HELP_CHANNEL_RAISE "channels/raise_channel.html"
#define GIMP_HELP_CHANNEL_LOWER "channels/lower_channel.html" #define GIMP_HELP_CHANNEL_LOWER "channels/lower_channel.html"
#define GIMP_HELP_CHANNEL_DUPLICATE "channels/duplicate_channel.html" #define GIMP_HELP_CHANNEL_DUPLICATE "channels/duplicate_channel.html"
#define GIMP_HELP_CHANNEL_DELETE "channels/delete_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_SELECTION_REPLACE "channels/channel_to_selection.html"
#define GIMP_HELP_CHANNEL_SEL_ADD "channels/channel_to_selection.html#add" #define GIMP_HELP_CHANNEL_SELECTION_ADD "channels/channel_to_selection.html#add"
#define GIMP_HELP_CHANNEL_SEL_SUB "channels/channel_to_selection.html#subtract" #define GIMP_HELP_CHANNEL_SELECTION_SUBTRACT "channels/channel_to_selection.html#subtract"
#define GIMP_HELP_CHANNEL_SEL_INTERSECT "channels/channel_to_selection.html#intersect" #define GIMP_HELP_CHANNEL_SELECTION_INTERSECT "channels/channel_to_selection.html#intersect"
#define GIMP_HELP_CHANNEL_EDIT "channels/dialogs/edit_channel_attributes.html" #define GIMP_HELP_CHANNEL_EDIT "dialogs/edit_channel_attributes.html"
#define GIMP_HELP_PATH_DIALOG "paths/dislogs/paths_dialog.html" #define GIMP_HELP_QMASK_TOGGLE "select/quickmask.html"
#define GIMP_HELP_PATH_NEW "paths/new_path.html" #define GIMP_HELP_QMASK_INVERT "select/quickmask.html"
#define GIMP_HELP_PATH_RAISE "paths/raise_path.html" #define GIMP_HELP_QMASK_EDIT "dialogs/edit_qmask_attributes.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_TOOL_BY_COLOR_SELECT "tools/by_color_select.html" #define GIMP_HELP_PATH_DIALOG "paths/dislogs/paths_dialog.html"
#define GIMP_HELP_TOOL_COLOR_BALANCE "tools/color_balance.html" #define GIMP_HELP_PATH_NEW "paths/new_path.html"
#define GIMP_HELP_TOOL_HUE_SATURATION "tools/hue_saturation.html" #define GIMP_HELP_PATH_RAISE "paths/raise_path.html"
#define GIMP_HELP_TOOL_COLORIZE "tools/colorize.html" #define GIMP_HELP_PATH_LOWER "paths/lower_path.html"
#define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST "tools/brightness-contrast.html" #define GIMP_HELP_PATH_DUPLICATE "paths/duplicate_path.html"
#define GIMP_HELP_TOOL_THRESHOLD "tools/threshold.html" #define GIMP_HELP_PATH_DELETE "paths/delete_path.html"
#define GIMP_HELP_TOOL_LEVELS "tools/levels.html" #define GIMP_HELP_PATH_SELECTION_REPLACE "paths/path_to_selection.html"
#define GIMP_HELP_TOOL_CURVES "tools/curves.html" #define GIMP_HELP_PATH_SELECTION_ADD "paths/path_to_selection.html#add"
#define GIMP_HELP_TOOL_POSTERIZE "tools/posterize.html" #define GIMP_HELP_PATH_SELECTION_SUBTRACT "paths/path_to_selection.html#subtract"
#define GIMP_HELP_TOOL_HISTOGRAM "tools/histogram.html" #define GIMP_HELP_PATH_SELECTION_INTERSECT "paths/path_to_selection.html#intersect"
#define GIMP_HELP_TOOL_ROTATE "tools/rotate.html" #define GIMP_HELP_PATH_STROKE "paths/stroke_path.html"
#define GIMP_HELP_TOOL_VECTORS "tools/vectors.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_TOOL_AIRBRUSH "tools/airbrush.html"
#define GIMP_HELP_FILTER_RESHOW "filters/reshow_last.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_FILTER_REPEAT "filters/repeat_last.html"
#define GIMP_HELP_TOOLBOX_DEFAULT_COLORS "toolbox/toolbox.html#default_colors" #define GIMP_HELP_FILTER_RESHOW "filters/reshow_last.html"
#define GIMP_HELP_TOOLBOX_SWAP_COLORS "toolbox/toolbox.html#swap_colors"
#define GIMP_HELP_BRUSH_DIALOG "dialogs/brush_selection.html" #define GIMP_HELP_TOOLBOX "toolbox/toolbox.html"
#define GIMP_HELP_BRUSH_NEW "dialogs/brush_selection.html" #define GIMP_HELP_TOOLBOX_DEFAULT_COLORS "toolbox/toolbox.html#default_colors"
#define GIMP_HELP_BRUSH_DUPLICATE "dialogs/brush_selection.html" #define GIMP_HELP_TOOLBOX_SWAP_COLORS "toolbox/toolbox.html#swap_colors"
#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_PATTERN_DIALOG "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_DIALOG "dialogs/brush_selection.html"
#define GIMP_HELP_PATTERN_NEW "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_NEW "dialogs/brush_selection.html"
#define GIMP_HELP_PATTERN_DUPLICATE "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_DUPLICATE "dialogs/brush_selection.html"
#define GIMP_HELP_PATTERN_EDIT "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_EDIT "dialogs/brush_selection.html"
#define GIMP_HELP_PATTERN_DELETE "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_DELETE "dialogs/brush_selection.html"
#define GIMP_HELP_PATTERN_REFRESH "dialogs/pattern_selection.html" #define GIMP_HELP_BRUSH_REFRESH "dialogs/brush_selection.html"
#define GIMP_HELP_GRADIENT_DIALOG "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_DIALOG "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_NEW "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_NEW "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_DUPLICATE "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_DUPLICATE "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_EDIT "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_EDIT "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_DELETE "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_DELETE "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_REFRESH "dialogs/gradient_selection.html" #define GIMP_HELP_PATTERN_REFRESH "dialogs/pattern_selection.html"
#define GIMP_HELP_GRADIENT_SAVE_AS_POV "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_DIALOG "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_DIALOG "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_NEW "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_NEW "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_DUPLICATE "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_DUPLICATE "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_EDIT "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_EDIT "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_DELETE "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_DELETE "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_REFRESH "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_REFRESH "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_IMPORT "dialogs/palette_selection.html" #define GIMP_HELP_GRADIENT_SAVE_AS_POV "dialogs/gradient_selection.html"
#define GIMP_HELP_PALETTE_MERGE "dialogs/palette_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_FONT_DIALOG "dialogs/font_selection.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_TEMPLATE_DIALOG "dialogs/templates.html" #define GIMP_HELP_BUFFER_DIALOG "dialogs/named_buffers.html"
#define GIMP_HELP_TEMPLATE_NEW "dialogs/templates.html" #define GIMP_HELP_BUFFER_CUT "dialogs/cut_named.html"
#define GIMP_HELP_TEMPLATE_DUPLICATE "dialogs/templates.html" #define GIMP_HELP_BUFFER_COPY "dialogs/copy_named.html"
#define GIMP_HELP_TEMPLATE_EDIT "dialogs/templates.html" #define GIMP_HELP_BUFFER_PASTE "dialogs/paste_named.html"
#define GIMP_HELP_TEMPLATE_IMAGE_NEW "dialogs/templates.html" #define GIMP_HELP_BUFFER_PASTE_INTO "dialogs/paste_named.html"
#define GIMP_HELP_TEMPLATE_DELETE "dialogs/templates.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_PREFS_DIALOG "dialogs/preferences/preferences.html"
#define GIMP_HELP_TOOL_OPTIONS_DIALOG "dialogs/tool_options.html" #define GIMP_HELP_PREFS_NEW_IMAGE "dialogs/preferences/new_file.html"
#define GIMP_HELP_DEVICE_STATUS_DIALOG "dialogs/device_status.html" #define GIMP_HELP_PREFS_NEW_IMAGE_COMMENT "dialogs/preferences/new_file.html#default_comment"
#define GIMP_HELP_DOCUMENT_DIALOG "file/dialogs/document_index.html" #define GIMP_HELP_PREFS_INTERFACE "dialogs/preferences/interface.html"
#define GIMP_HELP_MODULE_DIALOG "dialogs/module_manager.html" #define GIMP_HELP_PREFS_HELP "dialogs/preferences/interface.html#help_system"
#define GIMP_HELP_INFO_DIALOG "view/dialogs/info_window.html" #define GIMP_HELP_PREFS_TOOL_OPTIONS "dialogs/preferences/interface.html#tool_options"
#define GIMP_HELP_NAVIGATION_DIALOG "view/dialogs/navigation_window.html" #define GIMP_HELP_PREFS_INPUT_DEVICES "dialogs/preferences/input_devices.html"
#define GIMP_HELP_DISPLAY_FILTER_DIALOG "dialogs/display_filters/display_filters.html" #define GIMP_HELP_PREFS_IMAGE_WINDOW "dialogs/preferences/interface.html#image_windows"
#define GIMP_HELP_UNDO_DIALOG "dialogs/undo_history.html" #define GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE "dialogs/preferences/interface.html#image_windows"
#define GIMP_HELP_INDEXED_PALETTE_DIALOG "dialogs/indexed_palette.html" #define GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE "dialogs/preferences/interface.html#image_windows"
#define GIMP_HELP_ERROR_DIALOG "dialogs/error_console.html" #define GIMP_HELP_PREFS_DISPLAY "dialogs/preferences/display.html"
#define GIMP_HELP_TIPS_DIALOG "help/dialogs/tip_of_the_day.html" #define GIMP_HELP_PREFS_MONITOR "dialogs/preferences/monitor.html"
#define GIMP_HELP_ABOUT_DIALOG "help/dialogs/about.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_COLOR_DIALOG "dialogs/color.html"
#define GIMP_HELP_HELP_CONTEXT "help/context_help.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__ */ #endif /* __GIMP_HELP_IDS_H__ */

10
app/widgets/gimpitemfactory.c
View File

@ -32,6 +32,7 @@
#include "core/gimp.h" #include "core/gimp.h"
#include "gimphelp-ids.h"
#include "gimpitemfactory.h" #include "gimpitemfactory.h"
#include "gimpwidgets-utils.h" #include "gimpwidgets-utils.h"
@ -902,11 +903,10 @@ gimp_item_factory_item_key_press (GtkWidget *widget,
*/ */
if (kevent->keyval != GDK_F1) if (kevent->keyval != GDK_F1)
{ {
if (help_page && if (help_page &&
gtk_accelerator_valid (kevent->keyval, 0) && gtk_accelerator_valid (kevent->keyval, 0) &&
(item_factory == gimp_item_factory_from_path ("<Toolbox>")) && (strcmp (help_page, GIMP_HELP_HELP) == 0 ||
(strcmp (help_page, "help/dialogs/help.html") == 0 || strcmp (help_page, GIMP_HELP_HELP_CONTEXT) == 0))
strcmp (help_page, "help/context_help.html") == 0))
{ {
return TRUE; return TRUE;
} }

7
app/widgets/gimptoolbox.c
View File

@ -34,6 +34,7 @@
#include "gimpdevices.h" #include "gimpdevices.h"
#include "gimpdialogfactory.h" #include "gimpdialogfactory.h"
#include "gimphelp-ids.h"
#include "gimpitemfactory.h" #include "gimpitemfactory.h"
#include "gimptoolbox.h" #include "gimptoolbox.h"
#include "gimptoolbox-color-area.h" #include "gimptoolbox-color-area.h"
@ -188,10 +189,8 @@ gimp_toolbox_init (GimpToolbox *toolbox)
gtk_window_add_accel_group (GTK_WINDOW (toolbox), gtk_window_add_accel_group (GTK_WINDOW (toolbox),
GTK_ITEM_FACTORY (toolbox_factory)->accel_group); GTK_ITEM_FACTORY (toolbox_factory)->accel_group);
/* Connect the "F1" help key */ gimp_help_connect (GTK_WIDGET (toolbox), gimp_standard_help_func,
gimp_help_connect (GTK_WIDGET (toolbox), GIMP_HELP_TOOLBOX);
gimp_standard_help_func,
"toolbox/toolbox.html");
toolbox->wbox = gtk_hwrap_box_new (FALSE); toolbox->wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->wbox), GTK_JUSTIFY_TOP); gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->wbox), GTK_JUSTIFY_TOP);