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

build pixmaps/ before libgimpwidgets/.

2001-08-04  Michael Natterer  <mitch@gimp.org>

	* Makefile.am: build pixmaps/ before libgimpwidgets/.

	* pixmaps/.cvsignore
	* pixmaps/Makefile.am: build gimp-stock-pixbufs.h using
	gdk-pixbuf-csource from some of our XPMs.

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/gimpwidgets.h
	* libgimpwidgets/gimpstock.[ch]: new files featuring
	gimp_stock_init(). Register a default GtkIconFactory and a set of
	stock buttons.

	* app/gui/gui.[ch]: new function gui_libs_init(). Call
	gimp_stock_init() from it.

	* app/app_procs.c: call new function gui_libs_init().

	* libgimp/gimpui.c: call gimp_stock_init().

	* app/devices.c: removed action_area hacks as we can configure it
	via style properties now.

	* app/gui/menus.c: use <StockItem> for some menu entries.
	Looks nifty :-)

	* app/widgets/gimpcontainereditor.[ch]: take a "stock_id"
	parameter in gimp_container_editor_add_button(), not a EEKy
	pxm_data pointer.

	* app/widgets/gimpbufferview.c
	* app/widgets/gimpdatafactoryview.c: changed accordingly.

	* app/widgets/gimpchannellistview.c
	* app/widgets/gimpdrawablelistview.c: removed ugly tooltips
	formating hacks since gtk2 does it right now.

	* app/widgets/gimpdockbook.c: re-enabled a line that was commented
	out for some reason...?

	* app/errorconsole.c
	* app/gui/file-new-dialog.c
	* app/gui/tool-options-dialog.c
	* plug-ins/common/uniteditor.c: use the new GIMP_STOCK_FOO id's.

	* libgimpwidgets/gimpquerybox.c: fixed auto-hiding by connection
	to a passed object's signal.
parent a44ec6b3
2001-08-04 Michael Natterer <mitch@gimp.org>
* Makefile.am: build pixmaps/ before libgimpwidgets/.
* pixmaps/.cvsignore
* pixmaps/Makefile.am: build gimp-stock-pixbufs.h using
gdk-pixbuf-csource from some of our XPMs.
* libgimpwidgets/Makefile.am
* libgimpwidgets/gimpwidgets.h
* libgimpwidgets/gimpstock.[ch]: new files featuring
gimp_stock_init(). Register a default GtkIconFactory and a set of
stock buttons.
* app/gui/gui.[ch]: new function gui_libs_init(). Call
gimp_stock_init() from it.
* app/app_procs.c: call new function gui_libs_init().
* libgimp/gimpui.c: call gimp_stock_init().
* app/devices.c: removed action_area hacks as we can configure it
via style properties now.
* app/gui/menus.c: use <StockItem> for some menu entries.
Looks nifty :-)
* app/widgets/gimpcontainereditor.[ch]: take a "stock_id"
parameter in gimp_container_editor_add_button(), not a EEKy
pxm_data pointer.
* app/widgets/gimpbufferview.c
* app/widgets/gimpdatafactoryview.c: changed accordingly.
* app/widgets/gimpchannellistview.c
* app/widgets/gimpdrawablelistview.c: removed ugly tooltips
formating hacks since gtk2 does it right now.
* app/widgets/gimpdockbook.c: re-enabled a line that was commented
out for some reason...?
* app/errorconsole.c
* app/gui/file-new-dialog.c
* app/gui/tool-options-dialog.c
* plug-ins/common/uniteditor.c: use the new GIMP_STOCK_FOO id's.
* libgimpwidgets/gimpquerybox.c: fixed auto-hiding by connection
to a passed object's signal.
2001-08-03 Michael Natterer <mitch@gimp.org>
* gtkrc: set style properties for dockables.
......
......@@ -4,6 +4,7 @@ SUBDIRS = \
tools \
intl \
regexrepl \
pixmaps \
libgimpbase \
libgimpcolor \
libgimpmath \
......@@ -18,7 +19,6 @@ SUBDIRS = \
$(GIMP_PERL_PO) \
po-script-fu \
cursors \
pixmaps \
data \
tips \
docs \
......
......@@ -128,26 +128,7 @@ app_init (gint gimp_argc,
if (! no_interface)
{
const gchar *gtkrc;
gchar *filename;
/* parse the systemwide gtkrc */
gtkrc = gimp_gtkrc ();
if (be_verbose)
g_print (_("parsing \"%s\"\n"), gtkrc);
gtk_rc_parse (gtkrc);
/* parse the user gtkrc */
filename = gimp_personal_rc_file ("gtkrc");
if (be_verbose)
g_print (_("parsing \"%s\"\n"), filename);
gtk_rc_parse (filename);
g_free (filename);
gui_libs_init (&gimp_argc, &gimp_argv);
}
/* The user_install dialog may have parsed unitrc and gimprc, so
......@@ -187,10 +168,6 @@ app_init (gint gimp_argc,
app_init_update_status (_("Procedural Database"), NULL, -1);
internal_procs_init (the_gimp);
#ifdef DISPLAY_FILTERS
color_display_init ();
#endif /* DISPLAY_FILTERS */
/* Initialize the xcf file format routines
*/
xcf_init (the_gimp);
......@@ -215,6 +192,10 @@ app_init (gint gimp_argc,
if (! no_splash)
splash_destroy ();
#ifdef DISPLAY_FILTERS
color_display_init ();
#endif /* DISPLAY_FILTERS */
gui_init (the_gimp);
/* FIXME: This needs to go in preferences */
......
......@@ -195,37 +195,16 @@ GtkWidget *
input_dialog_create (void)
{
static GtkWidget *inputd = NULL;
GtkWidget *hbbox;
if (inputd)
return inputd;
inputd = gtk_input_dialog_new ();
gtk_container_set_border_width
(GTK_CONTAINER (GTK_DIALOG (inputd)->action_area), 2);
gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (inputd)->action_area),
FALSE);
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->save_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->save_button,
GTK_CAN_DEFAULT);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->close_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->close_button,
GTK_CAN_DEFAULT);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (inputd)->action_area), hbbox,
FALSE, FALSE, 0);
gtk_widget_grab_default (GTK_INPUT_DIALOG (inputd)->close_button);
gtk_widget_show(hbbox);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->save_button),
"clicked",
G_CALLBACK (devices_write_rc),
NULL);
NULL);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->close_button),
"clicked",
G_CALLBACK (devices_close_callback),
......
......@@ -350,7 +350,7 @@ file_new_dialog_create (GimpImage *gimage)
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
_("Reset"), file_new_reset_callback,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
......
......@@ -292,7 +292,7 @@ error_console_create (void)
GTK_WIN_POS_NONE,
TRUE, TRUE, FALSE,
_("Clear"), error_console_clear_callback,
GTK_STOCK_CLEAR, error_console_clear_callback,
text_buffer, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, error_console_close_callback,
text_buffer, NULL, NULL, TRUE, TRUE,
......
......@@ -195,37 +195,16 @@ GtkWidget *
input_dialog_create (void)
{
static GtkWidget *inputd = NULL;
GtkWidget *hbbox;
if (inputd)
return inputd;
inputd = gtk_input_dialog_new ();
gtk_container_set_border_width
(GTK_CONTAINER (GTK_DIALOG (inputd)->action_area), 2);
gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (inputd)->action_area),
FALSE);
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->save_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->save_button,
GTK_CAN_DEFAULT);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->close_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->close_button,
GTK_CAN_DEFAULT);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (inputd)->action_area), hbbox,
FALSE, FALSE, 0);
gtk_widget_grab_default (GTK_INPUT_DIALOG (inputd)->close_button);
gtk_widget_show(hbbox);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->save_button),
"clicked",
G_CALLBACK (devices_write_rc),
NULL);
NULL);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->close_button),
"clicked",
G_CALLBACK (devices_close_callback),
......
......@@ -350,7 +350,7 @@ file_new_dialog_create (GimpImage *gimage)
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
_("Reset"), file_new_reset_callback,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
......
......@@ -122,6 +122,34 @@ static GQuark image_update_handler_id = 0;
/* public functions */
void
gui_libs_init (gint *argc,
gchar ***argv)
{
const gchar *gtkrc;
gchar *filename;
gimp_stock_init ();
/* parse the systemwide gtkrc */
gtkrc = gimp_gtkrc ();
if (be_verbose)
g_print (_("parsing \"%s\"\n"), gtkrc);
gtk_rc_parse (gtkrc);
/* parse the user gtkrc */
filename = gimp_personal_rc_file ("gtkrc");
if (be_verbose)
g_print (_("parsing \"%s\"\n"), filename);
gtk_rc_parse (filename);
g_free (filename);
}
void
gui_init (Gimp *gimp)
{
......
......@@ -20,12 +20,15 @@
#define __GUI_H__
void gui_init (Gimp *gimp);
void gui_restore (Gimp *gimp);
void gui_post_init (Gimp *gimp);
void gui_libs_init (gint *argc,
gchar ***argv);
void gui_shutdown (Gimp *gimp);
void gui_exit (Gimp *gimp);
void gui_init (Gimp *gimp);
void gui_restore (Gimp *gimp);
void gui_post_init (Gimp *gimp);
void gui_shutdown (Gimp *gimp);
void gui_exit (Gimp *gimp);
void gui_really_quit_dialog (void);
......
......@@ -195,37 +195,16 @@ GtkWidget *
input_dialog_create (void)
{
static GtkWidget *inputd = NULL;
GtkWidget *hbbox;
if (inputd)
return inputd;
inputd = gtk_input_dialog_new ();
gtk_container_set_border_width
(GTK_CONTAINER (GTK_DIALOG (inputd)->action_area), 2);
gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (inputd)->action_area),
FALSE);
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->save_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->save_button,
GTK_CAN_DEFAULT);
gtk_widget_reparent (GTK_INPUT_DIALOG (inputd)->close_button, hbbox);
GTK_WIDGET_SET_FLAGS (GTK_INPUT_DIALOG (inputd)->close_button,
GTK_CAN_DEFAULT);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (inputd)->action_area), hbbox,
FALSE, FALSE, 0);
gtk_widget_grab_default (GTK_INPUT_DIALOG (inputd)->close_button);
gtk_widget_show(hbbox);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->save_button),
"clicked",
G_CALLBACK (devices_write_rc),
NULL);
NULL);
g_signal_connect (G_OBJECT (GTK_INPUT_DIALOG (inputd)->close_button),
"clicked",
G_CALLBACK (devices_close_callback),
......
......@@ -126,11 +126,13 @@ static GimpItemFactoryEntry toolbox_entries[] =
BRANCH (N_("/_File")),
{ { N_("/File/New..."), "<control>N",
file_new_cmd_callback, 0 },
file_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW },
NULL,
"file/dialogs/file_new.html", NULL },
{ { N_("/File/Open..."), "<control>O",
file_open_cmd_callback, 0 },
file_open_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
NULL,
"file/dialogs/file_open.html", NULL },
......@@ -143,7 +145,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/---"),
{ { N_("/File/Preferences..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES },
"gimp:preferences-dialog",
"file/dialogs/preferences/preferences.html", NULL },
......@@ -250,7 +253,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/---MRU"),
{ { N_("/File/Quit"), "<control>Q",
file_quit_cmd_callback, 0 },
file_quit_cmd_callback, 0,
"<StockItem>", GTK_STOCK_QUIT },
NULL,
"file/quit.html", NULL },
......@@ -270,7 +274,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
BRANCH (N_("/_Help")),
{ { N_("/Help/Help..."), "F1",
help_help_cmd_callback, 0 },
help_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
"help/dialogs/help.html", NULL },
{ { N_("/Help/Context Help..."), "<shift>F1",
......@@ -316,38 +321,46 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/File */
{ { N_("/File/New..."), "<control>N",
file_new_cmd_callback, 1 },
file_new_cmd_callback, 1,
"<StockItem>", GTK_STOCK_NEW },
NULL,
"file/dialogs/file_new.html", NULL },
{ { N_("/File/Open..."), "<control>O",
file_open_cmd_callback, 0 },
file_open_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
NULL,
"file/dialogs/file_open.html", NULL },
{ { N_("/File/Save"), "<control>S",
file_save_cmd_callback, 0 },
file_save_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Save as..."), NULL,
file_save_as_cmd_callback, 0 },
file_save_as_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE_AS },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Save a Copy as..."), NULL,
file_save_a_copy_as_cmd_callback, 0 },
file_save_a_copy_as_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE_AS },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Revert..."), NULL,
file_revert_cmd_callback, 0 },
file_revert_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REVERT_TO_SAVED },
NULL,
"file/revert.html", NULL },
SEPARATOR ("/File/---"),
{ { N_( "/File/Close"), "<control>W",
file_close_cmd_callback, 0 },
file_close_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CLOSE },
NULL,
"file/close.html", NULL },
{ { N_("/File/Quit"), "<control>Q",
file_quit_cmd_callback, 0 },
file_quit_cmd_callback, 0,
"<StockItem>", GTK_STOCK_QUIT },
NULL,
"file/quit.html", NULL },
......@@ -356,56 +369,67 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Edit */
{ { N_("/Edit/Undo"), "<control>Z",
edit_undo_cmd_callback, 0 },
edit_undo_cmd_callback, 0,
"<StockItem>", GTK_STOCK_UNDO },
NULL,
"edit/undo.html", NULL },
{ { N_("/Edit/Redo"), "<control>R",
edit_redo_cmd_callback, 0 },
edit_redo_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REDO },
NULL,
"edit/redo.html", NULL },
SEPARATOR ("/Edit/---"),
{ { N_("/Edit/Cut"), "<control>X",
edit_cut_cmd_callback, 0 },
edit_cut_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CUT },
NULL,
"edit/cut.html", NULL },
{ { N_("/Edit/Copy"), "<control>C",
edit_copy_cmd_callback, 0 },
edit_copy_cmd_callback, 0,
"<StockItem>", GTK_STOCK_COPY },
NULL,
"edit/copy.html", NULL },
{ { N_("/Edit/Paste"), "<control>V",
edit_paste_cmd_callback, 0 },
edit_paste_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
NULL,
"edit/paste.html", NULL },
{ { N_("/Edit/Paste Into"), NULL,
edit_paste_into_cmd_callback, 0 },
edit_paste_into_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
NULL,
"edit/paste_into.html", NULL },
{ { N_("/Edit/Paste as New"), NULL,
edit_paste_as_new_cmd_callback, 0 },
edit_paste_as_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
NULL,
"edit/paste_as_new.html", NULL },
/* <Image>/Edit/Buffer */
{ { N_("/Edit/Buffer/Cut Named..."), "<control><shift>X",
edit_named_cut_cmd_callback, 0 },
edit_named_cut_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CUT },
NULL,
"edit/dialogs/cut_named.html", NULL },
{ { N_("/Edit/Buffer/Copy Named..."), "<control><shift>C",
edit_named_copy_cmd_callback, 0 },
edit_named_copy_cmd_callback, 0,
"<StockItem>", GTK_STOCK_COPY },
NULL,
"edit/dialogs/copy_named.html", NULL },
{ { N_("/Edit/Buffer/Paste Named..."), "<control><shift>V",
edit_named_paste_cmd_callback, 0 },
edit_named_paste_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
NULL,
"edit/dialogs/paste_named.html", NULL },
SEPARATOR ("/Edit/---"),
{ { N_("/Edit/Clear"), "<control>K",
edit_clear_cmd_callback, 0 },
edit_clear_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CLEAR },
NULL,
"edit/clear.html", NULL },
{ { N_("/Edit/Fill with FG Color"), "<control>comma",
......@@ -474,10 +498,14 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/View */
{ { N_("/View/Zoom In"), "equal", view_zoomin_cmd_callback, 0 },
{ { N_("/View/Zoom In"), "equal",
view_zoomin_cmd_callback, 0,
"<StockItem>", GTK_STOCK_ZOOM_IN },
NULL,
"view/zoom.html", NULL },
{ { N_("/View/Zoom Out"), "minus", view_zoomout_cmd_callback, 0 },
{ { N_("/View/Zoom Out"), "minus",
view_zoomout_cmd_callback, 0,
"<StockItem>", GTK_STOCK_ZOOM_OUT },
NULL,
"view/zoom.html", NULL },
......@@ -495,7 +523,9 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/View/Zoom/2:1"), NULL, view_zoom_cmd_callback, 201 },
NULL,
"view/zoom.html", NULL },
{ { N_("/View/Zoom/1:1"), "1", view_zoom_cmd_callback, 101 },
{ { N_("/View/Zoom/1:1"), "1",
view_zoom_cmd_callback, 101,
"<StockItem>", GTK_STOCK_ZOOM_100 },
NULL,
"view/zoom.html", NULL },
{ { N_("/View/Zoom/1:2"), NULL, view_zoom_cmd_callback, 102 },
......@@ -564,15 +594,18 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Image/Mode */
{ { N_("/Image/Mode/RGB"), "<alt>R",
image_convert_rgb_cmd_callback, 0 },
image_convert_rgb_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
NULL,
"image/mode/convert_to_rgb.html", NULL },
{ { N_("/Image/Mode/Grayscale"), "<alt>G",
image_convert_grayscale_cmd_callback, 0 },
image_convert_grayscale_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
NULL,
"image/mode/convert_to_grayscale.html", NULL },
{ { N_("/Image/Mode/Indexed..."), "<alt>I",
image_convert_indexed_cmd_callback, 0 },
image_convert_indexed_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
NULL,
"image/mode/dialogs/convert_to_indexed.html", NULL },
......@@ -660,19 +693,23 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/stack/stack.html#next_layer", NULL },
{ { N_("/Layers/Stack/Raise Layer"), "<shift>Prior",
layers_raise_cmd_callback, 0 },
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
NULL,
"layers/stack/stack.html#raise_layer", NULL },
{ { N_("/Layers/Stack/Lower Layer"), "<shift>Next",
layers_lower_cmd_callback, 0 },
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
NULL,
"layers/stack/stack.html#lower_layer", NULL },
{ { N_("/Layers/Stack/Layer to Top"), "<control>Prior",
layers_raise_to_top_cmd_callback, 0 },
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
NULL,
"layers/stack/stack.html#layer_to_top", NULL },
{ { N_("/Layers/Stack/Layer to Bottom"), "<control>Next",
layers_lower_to_bottom_cmd_callback, 0 },
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
NULL,
"layers/stack/stack.html#layer_to_bottom", NULL },
......@@ -813,11 +850,13 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Filters */
{ { N_("/Filters/Repeat Last"), "<alt>F",
filters_repeat_cmd_callback, (guint) FALSE },
filters_repeat_cmd_callback, (guint) FALSE,
"<StockItem>", GTK_STOCK_EXECUTE },
NULL,
"filters/repeat_last.html", NULL },
{ { N_("/Filters/Re-Show Last"), "<alt><shift>F",
filters_repeat_cmd_callback, (guint) TRUE },
filters_repeat_cmd_callback, (guint) TRUE,
"<StockItem>", GTK_STOCK_EXECUTE },
NULL,
"filters/reshow_last.html", NULL },
......@@ -2081,7 +2120,8 @@ menus_init_mru (void)
last_opened_entries[i].entry.callback = file_last_opened_cmd_callback;
last_opened_entries[i].entry.callback_action = i;
last_opened_entries[i].entry.item_type = NULL;
last_opened_entries[i].entry.item_type = "<StockItem>";
last_opened_entries[i].entry.extra_data = GTK_STOCK_OPEN;
last_opened_entries[i].quark_string = NULL;
last_opened_entries[i].help_page = "file/last_opened.html";
last_opened_entries[i].description = NULL;
......
......@@ -101,7 +101,7 @@ tool_options_dialog_create (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, TRUE,
_("Reset"), tool_options_dialog_reset_callback,
GIMP_STOCK_RESET, tool_options_dialog_reset_callback,
NULL, NULL, &options_reset_button, FALSE, FALSE,
GTK_STOCK_CLOSE, tool_options_dialog_close_callback,
......
......@@ -126,11 +126,13 @@ static GimpItemFactoryEntry toolbox_entries[] =
BRANCH (N_("/_File")),
{ { N_("/File/New..."), "<control>N",
file_new_cmd_callback, 0 },
file_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW },
NULL,
"file/dialogs/file_new.html", NULL },
{ { N_("/File/Open..."), "<control>O",
file_open_cmd_callback, 0 },
file_open_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
NULL,
"file/dialogs/file_open.html", NULL },
......@@ -143,7 +145,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/---"),
{ { N_("/File/Preferences..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES },
"gimp:preferences-dialog",
"file/dialogs/preferences/preferences.html", NULL },
......@@ -250,7 +253,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/---MRU"),
{ { N_("/File/Quit"), "<control>Q",
file_quit_cmd_callback, 0 },
file_quit_cmd_callback, 0,
"<StockItem>", GTK_STOCK_QUIT },
NULL,
"file/quit.html", NULL },
......@@ -270,7 +274,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
BRANCH (N_("/_Help")),
{ { N_("/Help/Help..."), "F1",
help_help_cmd_callback, 0 },
help_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
"help/dialogs/help.html", NULL },
{ { N_("/Help/Context Help..."), "<shift>F1",
......@@ -316,38 +321,46 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/File */
{ { N_("/File/New..."), "<control>N",
file_new_cmd_callback, 1 },
file_new_cmd_callback, 1,
"<StockItem>", GTK_STOCK_NEW },
NULL,
"file/dialogs/file_new.html", NULL },
{ { N_("/File/Open..."), "<control>O",
file_open_cmd_callback, 0 },
file_open_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
NULL,
"file/dialogs/file_open.html", NULL },
{ { N_("/File/Save"), "<control>S",
file_save_cmd_callback, 0 },
file_save_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Save as..."), NULL,
file_save_as_cmd_callback, 0 },
file_save_as_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE_AS },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Save a Copy as..."), NULL,
file_save_a_copy_as_cmd_callback, 0 },
file_save_a_copy_as_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE_AS },
NULL,
"file/dialogs/file_save.html", NULL },
{ { N_("/File/Revert..."), NULL,
file_revert_cmd_callback, 0 },
file_revert_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REVERT_TO_SAVED },
NULL,
"file/revert.html", NULL },
SEPARATOR ("/File/---"),
{ { N_( "/File/Close"), "<control>W",
file_close_cmd_callback, 0 },
file_close_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CLOSE },
NULL,
"file/close.html", NULL },
{ { N_("/File/Quit"), "<control>Q",
file_quit_cmd_callback, 0 },
file_quit_cmd_callback, 0,
"<StockItem>", GTK_STOCK_QUIT },
NULL,
"file/quit.html", NULL },
......@@ -356,56 +369,67 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Edit */
{ { N_("/Edit/Undo"), "<control>Z",
edit_undo_cmd_callback, 0 },
edit_undo_cmd_callback, 0,
"<StockItem>", GTK_STOCK_UNDO },
NULL,
"edit/undo.html", NULL },
{ { N_("/Edit/Redo"), "<control>R",
edit_redo_cmd_callback, 0 },
edit_redo_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REDO },
NULL,
"edit/redo.html", NULL },
SEPARATOR ("/Edit/---"),
{ { N_("/Edit/Cut"), "<control>X",
edit_cut_cmd_callback, 0 },
edit_cut_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CUT },
NULL,
"edit/cut.html", NULL },
{ { N_("/Edit/Copy"), "<control>C",
edit_copy_cmd_callback, 0 },
edit_copy_cmd_callback, 0,
"<StockItem>", GTK_STOCK_COPY },
NULL,
"edit/copy.html", NULL },