Skip to content
GitLab
Commit 5a01821b authored by Michael Natterer's avatar Michael Natterer
Browse files

EEEEEEEEEEK!!!

parent 3b3e490f
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 5a01821b
1999-10-04 Michael Natterer <mitch@gimp.org>
* app/channels_dialog.c
* app/docindexif.c
* app/fileops.c
* app/gdisplay_color_ui.c
* app/gimphelp.c
* app/gradient.c
* app/interface.c
* app/lc_dialog.c
* app/menus.c
* app/palette.c
* app/paths_dialog.c
* app/preferences_dialog.c
* app/resize.c
* app/tips_dialog.c
* app/undo_history.c: many small help system fixes.
* help/*
* configure.in: _LOTS_ of new files + Makefiles. Enjoy ;-)
* help/ChangeLog: new file. Please read it.
Mon Oct 4 09:00:51 1999 ape@gandalf.spacetec.no (Asbjorn Pettersen)
* plug-ins/common/gz.c (load_image): BUG loading gz files
......@@ -104,19 +127,19 @@ Sun Oct 3 19:21:00 PDT 1999 Manish Singh <yosh@gimp.org>
Lots of stuff for the bezier-tool which will be also used for the
interface for the intelligent scissors. I started to factor out the
formulas for the actual curve type, so it is some kind of independant.
formulas for the actual curve type, so it is some kind of independent.
To try this out simply change the "#if 0" in app/path_curve.c to
a "#if 1" to handle straight lines instead of strange beziers with
fixed handles :-)
The functions in app/path_curves.c implement some kind of
default-action, where useful. To implement a new curve-tzpe it
default-action, where useful. To implement a new curve-type it
should be sufficient to overload the path_curve_get_point()
function. Of course, then the speed is not as performant... :-)
The API for other types is not yet completely fixed, esp. Im not
The API for other types is not yet completely fixed, esp. I'm not
clear about when to give a Tool* or PathTool* as a parameter.
But it shows the way, I want to implement this. In the next step
I'll fill the stubs in app/path_bezer.c.
But it shows the way I want to implement this. In the next step
I'll fill the stubs in app/path_bezier.c.
New handling functions: The Tool detects, when you are over an curve
and lets you split it there by shift clicking.
......@@ -130,10 +153,10 @@ Sun Oct 3 19:21:00 PDT 1999 Manish Singh <yosh@gimp.org>
* libgimp/gimp.h: some wrappers for PDB functions
* libgimp/gimpexport.[ch]: new files
This fixes a longstanding bug and the MostFAQ: When saving a file, the
file-save plug-ins can use gimp_export_image() to get the file converted
to a format they can handle. The conversion is performed on a duplicate
of the image; the original image stays as is.
This fixes a longstanding bug and the MostFAQ: When saving a file,
the file-save plug-ins can use gimp_export_image() to get the file
converted to a format they can handle. The conversion is performed
on a duplicate of the image; the original image stays as is.
* libgimp/Makefile.am
* libgimp/gimpui.h
......@@ -156,7 +179,6 @@ Sun Oct 3 19:21:00 PDT 1999 Manish Singh <yosh@gimp.org>
* app/fileops.c
* app/menus.[ch]
* app/menus.h
* app/plug_in.c: show a help page for all menu entries registered
by plugins.
Changed menus_create() to menus_create_item_from_full_path() which
......
app/channels_dialog.c
View file @ 5a01821b
......@@ -2391,7 +2391,7 @@ channels_dialog_new_channel_query (GimpImage* gimage)
options->query_box =
gimp_dialog_new (_("New Channel Options"), "new_channel_options",
gimp_standard_help_func,
"dialogs/channels/dialogs/new_channel.html",
"dialogs/channels/new_channel.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
app/dialogs/preferences-dialog.c
View file @ 5a01821b
......@@ -287,7 +287,6 @@ file_prefs_ok_callback (GtkWidget *widget,
* changed on the fly. Currently it ignores these options if only OK is
* pressed.
*/
}
static void
......@@ -1164,7 +1163,7 @@ file_pref_cmd_callback (GtkWidget *widget,
prefs_dlg =
gimp_dialog_new (_("Preferences"), "gimp_preferences",
gimp_standard_help_func,
"dialogs/preferences.html",
"dialogs/preferences/preferences.html",
GTK_WIN_POS_NONE,
FALSE, FALSE, FALSE,
......
app/dialogs/resize-dialog.c
View file @ 5a01821b
......@@ -152,7 +152,7 @@ resize_widget_new (ResizeType type,
case ResizeLayer:
wmclass = "scale_layer";
window_title = _("Scale Layer");
help_page = "dialogs/layers/dialogs/scale_layer.html";
help_page = "layers/dialogs/scale_layer.html";
frame = gtk_frame_new (_("Size"));
break;
case ResizeImage:
......@@ -170,7 +170,7 @@ resize_widget_new (ResizeType type,
case ResizeLayer:
wmclass = "resize_layer";
window_title = _("Resize Layer");
help_page = "dialogs/layers/dialogs/resize_layer.html";
help_page = "layers/dialogs/resize_layer.html";
break;
case ResizeImage:
wmclass = "image_resize";
......
app/dialogs/tips-dialog.c
View file @ 5a01821b
......@@ -7,6 +7,7 @@
#include "gtk/gtk.h"
#include "tips_dialog.h"
#include "gimprc.h"
#include "gimphelp.h"
#include "interface.h"
#include "wilber.h"
......@@ -165,6 +166,11 @@ tips_dialog_create ()
gtk_widget_show (button_check);
old_show_tips = show_tips;
/* Connect the "F1" help key */
gimp_help_connect_help_accel (tips_dialog,
gimp_standard_help_func,
"dialogs/tip_of_the_day.html");
}
if (!GTK_WIDGET_VISIBLE (tips_dialog))
......
app/display/gimpdisplayshell-draw.c
View file @ 5a01821b
......@@ -591,7 +591,7 @@ create_toolbox (void)
/* Connect the "F1" help key */
gimp_help_connect_help_accel (window,
gimp_standard_help_func,
"toolbox/index.html");
"toolbox/toolbox.html");
wbox = gtk_vwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_FILL);
......@@ -954,7 +954,7 @@ create_display_shell (GDisplay* gdisp,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (gdisp->shell,
gimp_standard_help_func,
"image/index.html");
"image/image_window.html");
gtk_widget_show (arrow);
gtk_widget_show (gdisp->qmaskon);
......
app/display/gimpdisplayshell-filter-dialog.c
View file @ 5a01821b
......@@ -77,7 +77,7 @@ make_dialog (void)
cdd.shell = gimp_dialog_new (_("Color Display Filters"), "display_color",
gimp_standard_help_func,
"dialogs/display_filters.html",
"dialogs/display_filters/display_filters.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
......
app/display/gimpdisplayshell.c
View file @ 5a01821b
......@@ -591,7 +591,7 @@ create_toolbox (void)
/* Connect the "F1" help key */
gimp_help_connect_help_accel (window,
gimp_standard_help_func,
"toolbox/index.html");
"toolbox/toolbox.html");
wbox = gtk_vwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_FILL);
......@@ -954,7 +954,7 @@ create_display_shell (GDisplay* gdisp,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (gdisp->shell,
gimp_standard_help_func,
"image/index.html");
"image/image_window.html");
gtk_widget_show (arrow);
gtk_widget_show (gdisp->qmaskon);
......
app/docindexif.c
View file @ 5a01821b
......@@ -19,6 +19,7 @@
#include "docindexif.h"
#include "fileops.h"
#include "gimage.h"
#include "gimphelp.h"
#include "libgimp/gimpintl.h"
......@@ -260,4 +261,9 @@ make_idea_window (gint x,
/* Set the position of the window if it was requested */
if (x >= 0 && y >= 0)
gtk_widget_set_uposition (ideas->window, x, y);
/* Connect the "F1" help key */
gimp_help_connect_help_accel (ideas->window,
gimp_standard_help_func,
"dialogs/document_index.html");
}
app/fileops.c
View file @ 5a01821b
......@@ -176,7 +176,8 @@ file_ops_post_init (void)
file_proc = tmp->data;
tmp = tmp->next;
help_page = g_strconcat (g_basename (file_proc->prog),
help_page = g_strconcat ("filters/",
g_basename (file_proc->prog),
".html",
NULL);
g_strdown (help_page);
......@@ -200,7 +201,8 @@ file_ops_post_init (void)
file_proc = tmp->data;
tmp = tmp->next;
help_page = g_strconcat (g_basename (file_proc->prog),
help_page = g_strconcat ("filters/",
g_basename (file_proc->prog),
".html",
NULL);
g_strdown (help_page);
......@@ -254,7 +256,7 @@ file_open_callback (GtkWidget *widget,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (fileload,
gimp_standard_help_func,
"open/index.html");
"open/dialogs/file_open.html");
}
else
{
......@@ -474,7 +476,7 @@ file_save_as_callback (GtkWidget *widget,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (filesave,
gimp_standard_help_func,
"save/index.html");
"save/dialogs/file_save.html");
}
else
{
......
app/gdisplay_color_ui.c
View file @ 5a01821b
......@@ -77,7 +77,7 @@ make_dialog (void)
cdd.shell = gimp_dialog_new (_("Color Display Filters"), "display_color",
gimp_standard_help_func,
"dialogs/display_filters.html",
"dialogs/display_filters/display_filters.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
......
app/gimphelp.c
View file @ 5a01821b
......@@ -116,9 +116,9 @@ gimp_help (gchar *help_page)
proc_rec = procedural_db_lookup ("extension_gimp_help_browser");
if (proc_rec == NULL)
{
g_message (_("Could not find the GIMP Help Browser procedure\n"
"Note that you still have to compile this plugin "
"manually"));
g_message (_("Could not find the GIMP Help Browser procedure.\n"
"It probably was not compiled because\n"
"you don't have GtkXmHTML installed."));
return;
}
......
app/gradient.c
View file @ 5a01821b
......@@ -683,20 +683,21 @@ grad_create_gradient_editor_init (gint need_show)
g_editor = g_new (gradient_editor_t, 1);
/* Shell and main vbox */
g_editor->shell = gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/index.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
g_editor->shell =
gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
......@@ -1325,7 +1326,7 @@ ed_new_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("New gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/new_gradient.html",
"dialogs/gradient_editor/new_gradient.html",
_("Enter a name for the new gradient"),
_("untitled"),
NULL, NULL,
......@@ -1388,7 +1389,7 @@ ed_copy_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Copy gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/copy_gradient.html",
"dialogs/gradient_editor/copy_gradient.html",
_("Enter a name for the copied gradient"),
name,
NULL, NULL,
......@@ -1474,7 +1475,7 @@ ed_rename_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Rename gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/rename_gradient.html",
"dialogs/gradient_editor/rename_gradient.html",
_("Enter a new name for the gradient"),
curr_gradient->name,
NULL, NULL,
......@@ -1556,7 +1557,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
dialog = gimp_dialog_new (_("Delete gradient"), "delete_gradient",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/delete_gradient.html",
"dialogs/gradient_editor/delete_gradient.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -1682,7 +1683,7 @@ ed_save_pov_callback (GtkWidget *widget,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/save_as_pov_ray.html");
"dialogs/gradient_editor/save_as_pov_ray.html");
gtk_widget_show (window);
gtk_widget_set_sensitive (g_editor->shell, FALSE);
......@@ -4612,7 +4613,7 @@ cpopup_split_uniform_callback (GtkWidget *widget,
_("Split segments uniformly"),
"gradient_segment_split_uniformly",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/split_segments_uniformly.html",
"dialogs/gradient_editor/split_segments_uniformly.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -5171,7 +5172,7 @@ cpopup_replicate_callback (GtkWidget *widget,
_("Replicate selection"),
"gradient_segment_replicate",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/replicate_segment.html",
"dialogs/gradient_editor/replicate_segment.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
app/gradient_editor.c
View file @ 5a01821b
......@@ -683,20 +683,21 @@ grad_create_gradient_editor_init (gint need_show)
g_editor = g_new (gradient_editor_t, 1);
/* Shell and main vbox */
g_editor->shell = gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/index.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
g_editor->shell =
gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
......@@ -1325,7 +1326,7 @@ ed_new_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("New gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/new_gradient.html",
"dialogs/gradient_editor/new_gradient.html",
_("Enter a name for the new gradient"),
_("untitled"),
NULL, NULL,
......@@ -1388,7 +1389,7 @@ ed_copy_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Copy gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/copy_gradient.html",
"dialogs/gradient_editor/copy_gradient.html",
_("Enter a name for the copied gradient"),
name,
NULL, NULL,
......@@ -1474,7 +1475,7 @@ ed_rename_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Rename gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/rename_gradient.html",
"dialogs/gradient_editor/rename_gradient.html",
_("Enter a new name for the gradient"),
curr_gradient->name,
NULL, NULL,
......@@ -1556,7 +1557,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
dialog = gimp_dialog_new (_("Delete gradient"), "delete_gradient",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/delete_gradient.html",
"dialogs/gradient_editor/delete_gradient.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -1682,7 +1683,7 @@ ed_save_pov_callback (GtkWidget *widget,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/save_as_pov_ray.html");
"dialogs/gradient_editor/save_as_pov_ray.html");
gtk_widget_show (window);
gtk_widget_set_sensitive (g_editor->shell, FALSE);
......@@ -4612,7 +4613,7 @@ cpopup_split_uniform_callback (GtkWidget *widget,
_("Split segments uniformly"),
"gradient_segment_split_uniformly",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/split_segments_uniformly.html",
"dialogs/gradient_editor/split_segments_uniformly.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -5171,7 +5172,7 @@ cpopup_replicate_callback (GtkWidget *widget,
_("Replicate selection"),
"gradient_segment_replicate",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/replicate_segment.html",
"dialogs/gradient_editor/replicate_segment.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
app/gui/channels-dialog.c
View file @ 5a01821b
......@@ -2391,7 +2391,7 @@ channels_dialog_new_channel_query (GimpImage* gimage)
options->query_box =
gimp_dialog_new (_("New Channel Options"), "new_channel_options",
gimp_standard_help_func,
"dialogs/channels/dialogs/new_channel.html",
"dialogs/channels/new_channel.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
app/gui/gradient-editor.c
View file @ 5a01821b
......@@ -683,20 +683,21 @@ grad_create_gradient_editor_init (gint need_show)
g_editor = g_new (gradient_editor_t, 1);
/* Shell and main vbox */
g_editor->shell = gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/index.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
g_editor->shell =
gimp_dialog_new (_("Gradient Editor"), "gradient_editor",
gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html",
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
_("Save"), ed_save_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Refresh"), ed_refresh_grads_callback,
NULL, NULL, FALSE, FALSE,
_("Close"), ed_close_callback,
NULL, NULL, TRUE, TRUE,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
......@@ -1325,7 +1326,7 @@ ed_new_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("New gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/new_gradient.html",
"dialogs/gradient_editor/new_gradient.html",
_("Enter a name for the new gradient"),
_("untitled"),
NULL, NULL,
......@@ -1388,7 +1389,7 @@ ed_copy_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Copy gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/copy_gradient.html",
"dialogs/gradient_editor/copy_gradient.html",
_("Enter a name for the copied gradient"),
name,
NULL, NULL,
......@@ -1474,7 +1475,7 @@ ed_rename_gradient_callback (GtkWidget *widget,
qbox = gimp_query_string_box (_("Rename gradient"),
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/rename_gradient.html",
"dialogs/gradient_editor/rename_gradient.html",
_("Enter a new name for the gradient"),
curr_gradient->name,
NULL, NULL,
......@@ -1556,7 +1557,7 @@ ed_delete_gradient_callback (GtkWidget *widget,
dialog = gimp_dialog_new (_("Delete gradient"), "delete_gradient",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/delete_gradient.html",
"dialogs/gradient_editor/delete_gradient.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -1682,7 +1683,7 @@ ed_save_pov_callback (GtkWidget *widget,
/* Connect the "F1" help key */
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/save_as_pov_ray.html");
"dialogs/gradient_editor/save_as_pov_ray.html");
gtk_widget_show (window);
gtk_widget_set_sensitive (g_editor->shell, FALSE);
......@@ -4612,7 +4613,7 @@ cpopup_split_uniform_callback (GtkWidget *widget,
_("Split segments uniformly"),
"gradient_segment_split_uniformly",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/split_segments_uniformly.html",
"dialogs/gradient_editor/split_segments_uniformly.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......@@ -5171,7 +5172,7 @@ cpopup_replicate_callback (GtkWidget *widget,
_("Replicate selection"),
"gradient_segment_replicate",
gimp_standard_help_func,
"dialogs/gradient_editor/dialogs/replicate_segment.html",
"dialogs/gradient_editor/replicate_segment.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
app/gui/menus.c
View file @ 5a01821b
......@@ -60,15 +60,18 @@ static void tearoff_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action);
static char* G_GNUC_UNUSED dummyMenus[] = { N_("/File/MRU00 "),
N_("/File"),
N_("/File/Dialogs"),
N_("/Image/Transforms"),
N_("/Layers"),
N_("/Tools"),
N_("/Dialogs"),
N_("/View/Zoom"),
N_("/Stack")};
static gchar* G_GNUC_UNUSED dummyMenus[] =
{
N_("/File/MRU00 "),
N_("/File"),
N_("/File/Dialogs"),
N_("/Image/Transforms"),
N_("/Layers"),
N_("/Tools"),
N_("/Dialogs"),
N_("/View/Zoom"),
N_("/Stack")
};
static GSList *last_opened_raw_filenames = NULL;
......@@ -79,7 +82,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/New"), "<control>N", file_new_cmd_callback, 0 },
"file/dialogs/file_new.html", NULL },
{ { N_("/File/Open"), "<control>O", file_open_cmd_callback, 0 },
"open/index.html", NULL },
"file/open/dialogs/file_open.html", NULL },
{ { N_("/File/Acquire/tearoff1"), NULL, NULL, 0, "<Tearoff>" },
NULL, NULL },
{ { N_("/File/About..."), NULL, about_dialog_cmd_callback, 0 },
......@@ -87,7 +90,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/Help..."), NULL, gimp_help_cmd_callback, 0 },
"file/dialogs/help.html", NULL },
{ { N_("/File/Preferences..."), NULL, file_pref_cmd_callback, 0 },
"file/dialogs/preferences.html", NULL },
"file/dialogs/preferences/preferences.html", NULL },
{ { N_("/File/Tip of the day"), NULL, tips_dialog_cmd_callback, 0 },
"file/dialogs/tip_of_the_day.html", NULL },
......@@ -112,12 +115,12 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"file/dialogs/error_console.html", NULL },
{ { N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"file/dialogs/display_filters.html", NULL },
"file/dialogs/display_filters/display_filters.html", NULL },
{ { N_("/Xtns/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL, NULL },
{ { N_("/Xtns/Module Browser"), NULL, dialogs_module_browser_cmd_callback, 0 },
"xtns/module_browser.html", NULL },
"dialogs/module_browser.html", NULL },
{ { N_("/File/---"), NULL, NULL, 0, "<Separator>" },
NULL, NULL },
{ { N_("/File/---"), NULL, NULL, 0, "<Separator>" },
......@@ -133,7 +136,7 @@ static GimpItemFactoryEntry file_menu_separator =
static GimpItemFactoryEntry toolbox_end =
{ { N_("/File/Quit"), "<control>Q", file_quit_cmd_callback, 0 },
"file/dialogs/quit.html", NULL };
"file/quit.html", NULL };
static GimpItemFactoryEntry image_entries[] =
{
......@@ -144,22 +147,22 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/File/New"), "<control>N", file_new_cmd_callback, 1 },
"file/dialogs/file_new.html", NULL },