Commit fc20b3ac authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

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.
parent 37e2d34a
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>
* tools/gimpblendtool.c
......@@ -37,6 +37,7 @@
#include "core/gimpimage-scale.h"
#include "core/gimpimage-undo.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h"
......@@ -378,7 +379,7 @@ image_layers_merge_query (GimpImage *gimage,
GIMP_STOCK_MERGE_DOWN,
_("Layers Merge Options"),
gimp_standard_help_func,
"dialogs/layers/merge_visible_layers.html",
GIMP_HELP_IMAGE_MERGE_LAYERS,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
......@@ -442,7 +443,7 @@ image_resize_callback (GtkWidget *widget,
gtk_widget_set_sensitive (image_resize->resize->resize_shell, FALSE);
if (image_resize->resize->width > 0 &&
image_resize->resize->height > 0)
image_resize->resize->height > 0)
{
GimpProgress *progress;
......@@ -461,7 +462,7 @@ image_resize_callback (GtkWidget *widget,
gimp_image_flush (image_resize->gimage);
}
else
else
{
g_message (_("Resize Error: Both width and height must be "
"greater than zero."));
......@@ -498,7 +499,7 @@ image_scale_callback (GtkWidget *widget,
dialog =
gimp_query_boolean_box (_("Layer Too Small"),
gimp_standard_help_func,
"dialogs/scale_layer_warn.html",
GIMP_HELP_IMAGE_SCALE_WARNING,
GTK_STOCK_DIALOG_QUESTION,
_("The chosen image size will shrink\n"
"some layers completely away.\n"
......@@ -562,7 +563,7 @@ image_scale_implement (ImageResize *image_scale)
image_scale->resize->height != gimage->height)
{
if (image_scale->resize->width > 0 &&
image_scale->resize->height > 0)
image_scale->resize->height > 0)
{
GimpProgress *progress;
......
......@@ -30,6 +30,7 @@
#include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpdatafactoryview.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h"
#include "palette-import-dialog.h"
......@@ -80,7 +81,7 @@ palettes_merge_palettes_query (GimpContainerEditor *editor)
qbox = gimp_query_string_box (_("Merge Palette"),
gimp_standard_help_func,
"dialogs/palette_editor/merge_palette.html",
GIMP_HELP_PALETTE_MERGE,
_("Enter a name for merged palette"),
NULL,
G_OBJECT (editor), "destroy",
......
......@@ -31,6 +31,7 @@
#include "core/gimpimage-qmask.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h"
......@@ -56,7 +57,7 @@ struct _EditQmaskOptions
/* local function prototypes */
static void qmask_channel_query (GimpDisplayShell *shell);
static void qmask_query_ok_callback (GtkWidget *widget,
static void qmask_query_ok_callback (GtkWidget *widget,
gpointer client_data);
static void qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data);
......@@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell)
options->gimage = shell->gdisp->gimage;
options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"),
&options->gimage->qmask_color,
GIMP_COLOR_AREA_LARGE_CHECKS,
GIMP_COLOR_AREA_LARGE_CHECKS,
48, 64);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel),
gimp_get_user_context (options->gimage->gimp));
......@@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell)
GIMP_STOCK_QMASK_ON,
_("Edit QuickMask Attributes"),
gimp_standard_help_func,
"dialogs/edit_qmask_attributes.html",
GIMP_HELP_QMASK_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
......@@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell)
/* The opacity scale */
opacity_scale_data =
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_size_request (opacity_scale, 100, -1);
......@@ -202,14 +203,14 @@ qmask_channel_query (GimpDisplayShell *shell)
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed),
opacity_scale_data);
opacity_scale_data);
gtk_widget_show (options->query_box);
}
static void
qmask_query_ok_callback (GtkWidget *widget,
gpointer data)
static void
qmask_query_ok_callback (GtkWidget *widget,
gpointer data)
{
EditQmaskOptions *options;
GimpChannel *channel;
......@@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget,
gtk_widget_destroy (options->query_box);
}
static void
qmask_query_scale_update (GtkAdjustment *adjustment,
static void
qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data)
{
GimpRGB color;
......
......@@ -31,6 +31,7 @@
#include "core/gimpimage-qmask.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "display/gimpdisplay.h"
......@@ -56,7 +57,7 @@ struct _EditQmaskOptions
/* local function prototypes */
static void qmask_channel_query (GimpDisplayShell *shell);
static void qmask_query_ok_callback (GtkWidget *widget,
static void qmask_query_ok_callback (GtkWidget *widget,
gpointer client_data);
static void qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data);
......@@ -136,7 +137,7 @@ qmask_channel_query (GimpDisplayShell *shell)
options->gimage = shell->gdisp->gimage;
options->color_panel = gimp_color_panel_new (_("Edit Qmask Color"),
&options->gimage->qmask_color,
GIMP_COLOR_AREA_LARGE_CHECKS,
GIMP_COLOR_AREA_LARGE_CHECKS,
48, 64);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (options->color_panel),
gimp_get_user_context (options->gimage->gimp));
......@@ -148,7 +149,7 @@ qmask_channel_query (GimpDisplayShell *shell)
GIMP_STOCK_QMASK_ON,
_("Edit QuickMask Attributes"),
gimp_standard_help_func,
"dialogs/edit_qmask_attributes.html",
GIMP_HELP_QMASK_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
......@@ -181,7 +182,7 @@ qmask_channel_query (GimpDisplayShell *shell)
/* The opacity scale */
opacity_scale_data =
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_size_request (opacity_scale, 100, -1);
......@@ -202,14 +203,14 @@ qmask_channel_query (GimpDisplayShell *shell)
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed),
opacity_scale_data);
opacity_scale_data);
gtk_widget_show (options->query_box);
}
static void
qmask_query_ok_callback (GtkWidget *widget,
gpointer data)
static void
qmask_query_ok_callback (GtkWidget *widget,
gpointer data)
{
EditQmaskOptions *options;
GimpChannel *channel;
......@@ -238,8 +239,8 @@ qmask_query_ok_callback (GtkWidget *widget,
gtk_widget_destroy (options->query_box);
}
static void
qmask_query_scale_update (GtkAdjustment *adjustment,
static void
qmask_query_scale_update (GtkAdjustment *adjustment,
gpointer data)
{
GimpRGB color;
......
......@@ -32,6 +32,7 @@
#include "core/gimptemplate.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimptemplateeditor.h"
#include "widgets/gimptemplateview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -133,7 +134,7 @@ templates_new_template_dialog (Gimp *gimp,
GIMP_STOCK_TEMPLATE,
_("Create a New Template"),
gimp_standard_help_func,
"dialogs/new_template.html",
GIMP_HELP_TEMPLATE_NEW,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE,
......@@ -202,7 +203,7 @@ templates_edit_template_dialog (Gimp *gimp,
GIMP_STOCK_EDIT,
_("Edit Template"),
gimp_standard_help_func,
"dialogs/edit_template.html",
GIMP_HELP_TEMPLATE_EDIT,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, (gpointer) 1, NULL, FALSE, TRUE,
......
......@@ -32,6 +32,7 @@
#include "core/gimppalette.h"
#include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "palette-select.h"
......@@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage)
GIMP_STOCK_CONVERT_INDEXED,
_("Convert Image to Indexed Colors"),
gimp_standard_help_func,
"dialogs/convert_to_indexed.html",
GIMP_HELP_IMAGE_CONVERT_INDEXED,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
......
......@@ -39,6 +39,7 @@
#include "widgets/gimpcontainermenuimpl.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppreview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -167,7 +168,7 @@ palette_import_dialog_new (Gimp *gimp)
GTK_STOCK_CONVERT,
_("Import a New Palette"),
gimp_standard_help_func,
"dialogs/palette_editor/import_palette.html",
GIMP_HELP_PALETTE_IMPORT,
GTK_STOCK_CANCEL, palette_import_close_callback,
import_dialog, NULL, NULL, FALSE, TRUE,
......
......@@ -39,6 +39,7 @@
#include "widgets/gimpdeviceinfo.h"
#include "widgets/gimpdevices.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h"
......@@ -893,7 +894,7 @@ prefs_dialog_new (Gimp *gimp,
dialog = gimp_dialog_new (_("Preferences"), "preferences",
prefs_help_func,
"dialogs/preferences/preferences.html",
GIMP_HELP_PREFS_DIALOG,
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
......@@ -1015,7 +1016,7 @@ prefs_dialog_new (Gimp *gimp,
"new-image.png",
GTK_TREE_STORE (tree),
_("New Image"),
"dialogs/preferences/new_file.html",
GIMP_HELP_PREFS_NEW_IMAGE,
NULL,
&top_iter,
page_index++);
......@@ -1112,7 +1113,7 @@ prefs_dialog_new (Gimp *gimp,
"default-comment.png",
GTK_TREE_STORE (tree),
_("Default Comment"),
"dialogs/preferences/new_file.html#default_comment",
GIMP_HELP_PREFS_NEW_IMAGE_COMMENT,
&top_iter,
&child_iter,
page_index++);
......@@ -1149,7 +1150,7 @@ prefs_dialog_new (Gimp *gimp,
"interface.png",
GTK_TREE_STORE (tree),
_("Interface"),
"dialogs/preferences/interface.html",
GIMP_HELP_PREFS_INTERFACE,
NULL,
&top_iter,
page_index++);
......@@ -1269,7 +1270,7 @@ prefs_dialog_new (Gimp *gimp,
"help-system.png",
GTK_TREE_STORE (tree),
_("Help System"),
"dialogs/preferences/interface.html#help_system",
GIMP_HELP_PREFS_HELP,
&top_iter,
&child_iter,
page_index++);
......@@ -1305,7 +1306,7 @@ prefs_dialog_new (Gimp *gimp,
"tool-options.png",
GTK_TREE_STORE (tree),
_("Tool Options"),
"dialogs/preferences/interface.html#tool_options",
GIMP_HELP_PREFS_TOOL_OPTIONS,
&top_iter,
&child_iter,
page_index++);
......@@ -1337,7 +1338,7 @@ prefs_dialog_new (Gimp *gimp,
"input-devices.png",
GTK_TREE_STORE (tree),
_("Input Devices"),
"dialogs/preferences/input-devices.html",
GIMP_HELP_PREFS_INPUT_DEVICES,
&top_iter,
&child_iter,
page_index++);
......@@ -1385,7 +1386,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png",
GTK_TREE_STORE (tree),
_("Image Windows"),
"dialogs/preferences/interface.html#image_windows",
GIMP_HELP_PREFS_IMAGE_WINDOW,
&top_iter,
&child_iter,
page_index++);
......@@ -1452,7 +1453,7 @@ prefs_dialog_new (Gimp *gimp,
"image-windows.png",
GTK_TREE_STORE (tree),
_("Appearance"),
"dialogs/preferences/image_windows.html",
GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
&child_iter,
&grandchild_iter,
page_index++);
......@@ -1525,7 +1526,7 @@ prefs_dialog_new (Gimp *gimp,
"image-title.png",
GTK_TREE_STORE (tree),
_("Title & Status"),
"dialogs/preferences/image_windows.html",
GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE,
&child_iter,
&grandchild_iter,
page_index++);
......@@ -1650,7 +1651,7 @@ prefs_dialog_new (Gimp *gimp,
"display.png",
GTK_TREE_STORE (tree),
_("Display"),
"dialogs/preferences/display.html",
GIMP_HELP_PREFS_DISPLAY,
&top_iter,
&child_iter,
page_index++);
......@@ -1694,7 +1695,7 @@ prefs_dialog_new (Gimp *gimp,
"monitor.png",
GTK_TREE_STORE (tree),
_("Monitor"),
"dialogs/preferences/monitor.html",
GIMP_HELP_PREFS_MONITOR,
&top_iter,
&child_iter,
page_index++);
......@@ -1808,7 +1809,7 @@ prefs_dialog_new (Gimp *gimp,
"environment.png",
GTK_TREE_STORE (tree),
_("Environment"),
"dialogs/preferences/environment.html",
GIMP_HELP_PREFS_ENVIRONMENT,
NULL,
&top_iter,
page_index++);
......@@ -1866,7 +1867,7 @@ prefs_dialog_new (Gimp *gimp,
"folders.png",
GTK_TREE_STORE (tree),
_("Folders"),
"dialogs/preferences/folders.html",
GIMP_HELP_PREFS_FOLDERS,
NULL,
&top_iter,
page_index++);
......@@ -1915,39 +1916,39 @@ prefs_dialog_new (Gimp *gimp,
paths[] =
{
{ N_("Brushes"), N_("Brush Folders"), "folders-brushes.png",
"dialogs/preferences/folders.html#brushes",
GIMP_HELP_PREFS_FOLDERS_BRUSHES,
N_("Select Brush Folders"),
"brush-path" },
{ N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png",
"dialogs/preferences/folders.html#patterns",
GIMP_HELP_PREFS_FOLDERS_PATTERNS,
N_("Select Pattern Folders"),
"pattern-path" },
{ N_("Palettes"), N_("Palette Folders"), "folders-palettes.png",
"dialogs/preferences/folders.html#palettes",
GIMP_HELP_PREFS_FOLDERS_PALETTES,
N_("Select Palette Folders"),
"palette-path" },
{ N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",
"dialogs/preferences/folders.html#gradients",
GIMP_HELP_PREFS_FOLDERS_GRADIENTS,
N_("Select Gradient Folders"),
"gradient-path" },
{ N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png",
"dialogs/preferences/folders.html#plug_ins",
GIMP_HELP_PREFS_FOLDERS_PLUG_INS,
N_("Select Plug-In Folders"),
"plug-in-path" },
{ N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts.png",
"dialogs/preferences/folders.html#scripts",
GIMP_HELP_PREFS_FOLDERS_SCRIPTS,
N_("Select Script-Fu Folders"),
"script-fu-path" },
{ N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules",
GIMP_HELP_PREFS_FOLDERS_MODULES,
N_("Select Module Folders"),
"module-path" },
{ N_("Environment"), N_("Environment Folders"), "folders-environ.png",
"dialogs/preferences/folders.html#environ",
GIMP_HELP_PREFS_FOLDERS_ENVIRONMENT,
N_("Select Environment Folders"),
"environ-path" },
{ N_("Themes"), N_("Theme Folders"), "folders-themes.png",
"dialogs/preferences/folders.html#themes",
GIMP_HELP_PREFS_FOLDERS_THEMES,
N_("Select Theme Folders"),
"theme-path" }
};
......
......@@ -51,6 +51,7 @@
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h"
......@@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell)
gimp_display_shell_drop_color,
shell);
/* connect the "F1" help key */
gimp_help_connect (GTK_WIDGET (shell),
gimp_standard_help_func,
gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func,
"image/image_window.html");
}
......@@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
shell->warning_dialog =
gimp_query_boolean_box (title,
gimp_standard_help_func,
"dialogs/really_close.html",
GIMP_HELP_FILE_CLOSE_CONFIRM,
GIMP_STOCK_QUESTION,
warning,
GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,
......
......@@ -51,6 +51,7 @@
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h"
......@@ -335,9 +336,7 @@ gimp_display_shell_init (GimpDisplayShell *shell)
gimp_display_shell_drop_color,
shell);
/* connect the "F1" help key */
gimp_help_connect (GTK_WIDGET (shell),
gimp_standard_help_func,
gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func,
"image/image_window.html");
}
......@@ -1720,7 +1719,7 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
shell->warning_dialog =
gimp_query_boolean_box (title,
gimp_standard_help_func,
"dialogs/really_close.html",
GIMP_HELP_FILE_CLOSE_CONFIRM,
GIMP_STOCK_QUESTION,
warning,
GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,
......
......@@ -36,8 +36,9 @@
#include "pdb/procedural_db.h"
#include "widgets/gimpcontainerview.h"
#include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpcontainerview.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-constructors.h"
#include "brush-select.h"
......@@ -145,7 +146,7 @@ brush_select_new (Gimp *gimp,
/* The shell */
bsp->shell = gimp_dialog_new (title, "brush_selection",
gimp_standard_help_func,
"dialogs/brush_selection.html",
GIMP_HELP_BRUSH_DIALOG,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -177,7 +178,7 @@ brush_select_new (Gimp *gimp,
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
/* Create the opacity scale widget */
bsp->opacity_data =
bsp->opacity_data =
GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Opacity:"), -1, 5,
gimp_context_get_opacity (bsp->context) * 100.0,
......@@ -221,7 +222,7 @@ brush_select_free (BrushSelect *bsp)
{
g_return_if_fail (bsp != NULL);
gtk_widget_destroy (bsp->shell);
gtk_widget_destroy (bsp->shell);
/* remove from active list */
brush_active_dialogs = g_slist_remove (brush_active_dialogs, bsp);
......@@ -298,7 +299,7 @@ brush_select_change_callbacks (BrushSelect *bsp,
if (proc && brush)
{
Argument *return_vals;
Argument *return_vals;
gint nreturn_vals;
return_vals =
......@@ -412,5 +413,5 @@ brush_select_close_callback (GtkWidget *widget,
BrushSelect *bsp)
{
brush_select_change_callbacks (bsp, TRUE);
brush_select_free (bsp);
brush_select_free (bsp);
}
......@@ -73,22 +73,22 @@ GimpItemFactoryEntry channels_menu_entries[] =
channels_selection_replace_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
GIMP_HELP_CHANNEL_SEL_REPLACE, NULL },
GIMP_HELP_CHANNEL_SELECTION_REPLACE, NULL },
{ { N_("/_Add to Selection"), NULL,
channels_selection_add_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_ADD },
NULL,
GIMP_HELP_CHANNEL_SEL_ADD, NULL },
GIMP_HELP_CHANNEL_SELECTION_ADD, NULL },
{ { N_("/_Subtract from Selection"), NULL,
channels_selection_sub_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_SUBTRACT },
NULL,
GIMP_HELP_CHANNEL_SEL_SUB, NULL },
GIMP_HELP_CHANNEL_SELECTION_SUBTRACT, NULL },
{ { N_("/_Intersect with Selection"), NULL,
channels_selection_intersect_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_INTERSECT },
NULL,
GIMP_HELP_CHANNEL_SEL_INTERSECT, NULL },
GIMP_HELP_CHANNEL_SELECTION_INTERSECT, NULL },
MENU_SEPARATOR ("/---"),
......
......@@ -32,6 +32,7 @@
#include "core/gimppalette.h"
#include "widgets/gimpenummenu.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpviewabledialog.h"
#include "palette-select.h"
......@@ -130,7 +131,7 @@ convert_to_indexed (GimpImage *gimage)
GIMP_STOCK_CONVERT_INDEXED,
_("Convert Image to Indexed Colors"),
gimp_standard_help_func,
"dialogs/convert_to_indexed.html",
GIMP_HELP_IMAGE_CONVERT_INDEXED,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
......
......@@ -30,6 +30,7 @@
#include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h"
#include "file-commands.h"
......@@ -44,14 +45,14 @@ GimpItemFactoryEntry file_open_menu_entries[] =
{ { N_("/Automatic"), NULL,
file_open_by_extension_cmd_callback, 0 },
NULL,
"open_by_extension.html", NULL },
GIMP_HELP_FILE_OPEN_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---")
};
gint n_file_open_menu_entries = G_N_ELEMENTS (file_open_menu_entries);
void
file_open_menu_setup (GimpItemFactory *factory)
{
......
......@@ -31,6 +31,7 @@
#include "plug-in/plug-in-proc.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpitemfactory.h"
#include "file-commands.h"
......@@ -45,7 +46,7 @@ GimpItemFactoryEntry file_save_menu_entries[] =
{ { N_("/By Extension"), NULL,
file_save_by_extension_cmd_callback, 0 },
NULL,
"save_by_extension.html", NULL },
GIMP_HELP_FILE_SAVE_BY_EXTENSION, NULL },
MENU_SEPARATOR ("/---")
};
......
......@@ -35,6 +35,7 @@
#include "pdb/procedural_db.h"
#include "widgets/gimpcontainertreeview.h"
#include "widgets/gimphelp-ids.h"
#include "dialogs-constructors.h"
#include "menus.h"
......@@ -101,7 +102,7 @@ font_select_new (Gimp *gimp,
/* the shell */
font_select->shell = gimp_dialog_new (title, "font_selection",
gimp_standard_help_func,
"dialogs/font_selection.html",
GIMP_HELP_FONT_DIALOG,
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -135,7 +136,7 @@ font_select_free (FontSelect *font_select)
{
g_return_if_fail (font_select != NULL);
gtk_widget_destroy (font_select->shell);
gtk_widget_destroy (font_select->shell);
/* remove from active list */
font_active_dialogs = g_slist_remove (font_active_dialogs, font_select);
......@@ -185,7 +186,7 @@ font_select_dialogs_check (void)
{
if (! procedural_db_lookup (font_select->context->gimp,
font_select->callback_name))
font_select_close_callback (NULL, font_select);
font_select_close_callback (NULL, font_select);
}
}
}
......@@ -215,7 +216,7 @@ font_select_change_callbacks (FontSelect *font_select,
if (proc && font)
{
Argument *return_vals;
Argument *return_vals;
gint nreturn_vals;
return_vals =
......@@ -225,7 +226,7 @@ font_select_change_callbacks (FontSelect *font_select,
GIMP_PDB_STRING, GIMP_OBJECT (font)->name,
GIMP_PDB_INT32, closing,
GIMP_PDB_END);