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

set style properties for dockables.

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

	* gtkrc: set style properties for dockables.

	* app/main.c: some #if 0'ed code for mem profiling.

	* app/gui/commands.[ch]
	* app/gui/menus.c: added a mem profiling menu entry + callback.

	* app/gui/palette-editor.c: added a #warning as reminder, use
	gtk_dialog_set_has_separator().

	* app/widgets/gimpcontainereditor.[ch]
	* app/widgets/gimpcontainerview.[ch]
	* app/widgets/gimpdockable.[ch]
	* app/widgets/gimpdrawablelistview.[ch]: added some style
	properties to set GimpDockable and friends' borders and spacings.

	* libgimpwidgets/gimppixmap.[ch]
	* libgimpwidgets/gimpsizeentry.[ch]
	* libgimpwidgets/gimpunitmenu.[ch]: GObject stuff, cleanup.

	* app/docindex.c
	* app/errorconsole.c
	* app/gdisplay_color_ui.c
	* app/gimpprogress.c
	* app/module_db.c
	* app/undo_history.c
	* app/user_install.c
	* app/gui/channels-commands.c
	* app/gui/gradient-editor.c
	* app/gui/info-window.c
	* app/gui/tips-dialog.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimphistogramtool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpmeasuretool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimpthresholdtool.c
	* app/widgets/gimpdatafactoryview.c
	* libgimp/gimpexport.c
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* plug-ins/[lots of files]:

	Some perl mass processing applying s/_("Foo")/GTK_STOCK_FOO/g,
	minor manual cleanup in some files.
parent 2f555823
2001-08-03 Michael Natterer <mitch@gimp.org>
* gtkrc: set style properties for dockables.
* app/main.c: some #if 0'ed code for mem profiling.
* app/gui/commands.[ch]
* app/gui/menus.c: added a mem profiling menu entry + callback.
* app/gui/palette-editor.c: added a #warning as reminder, use
gtk_dialog_set_has_separator().
* app/widgets/gimpcontainereditor.[ch]
* app/widgets/gimpcontainerview.[ch]
* app/widgets/gimpdockable.[ch]
* app/widgets/gimpdrawablelistview.[ch]: added some style
properties to set GimpDockable and friends' borders and spacings.
* libgimpwidgets/gimppixmap.[ch]
* libgimpwidgets/gimpsizeentry.[ch]
* libgimpwidgets/gimpunitmenu.[ch]: GObject stuff, cleanup.
* app/docindex.c
* app/errorconsole.c
* app/gdisplay_color_ui.c
* app/gimpprogress.c
* app/module_db.c
* app/undo_history.c
* app/user_install.c
* app/gui/channels-commands.c
* app/gui/gradient-editor.c
* app/gui/info-window.c
* app/gui/tips-dialog.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpcroptool.c
* app/tools/gimpcurvestool.c
* app/tools/gimphistogramtool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimplevelstool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpposterizetool.c
* app/tools/gimpthresholdtool.c
* app/widgets/gimpdatafactoryview.c
* libgimp/gimpexport.c
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c
* plug-ins/[lots of files]:
Some perl mass processing applying s/_("Foo")/GTK_STOCK_FOO/g,
minor manual cleanup in some files.
2001-08-02 Michael Natterer <mitch@gimp.org>
* app/tools/gimptexttool.c:
......
......@@ -353,9 +353,9 @@ channels_new_channel_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("OK"), new_channel_query_ok_callback,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
_("Cancel"), gtk_widget_destroy,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
......@@ -506,9 +506,9 @@ channels_edit_channel_query (GimpChannel *channel)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("OK"), edit_channel_query_ok_callback,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
_("Cancel"), gtk_widget_destroy,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
......
......@@ -54,3 +54,10 @@ help_context_help_cmd_callback (GtkWidget *widget,
{
gimp_context_help ();
}
void
mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
g_mem_profile ();
}
......@@ -29,5 +29,8 @@ void help_help_cmd_callback (GtkWidget *widget,
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
void mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
......@@ -358,11 +358,11 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), color_balance_ok_callback,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
_("Reset"), color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
_("Cancel"), color_balance_cancel_callback,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -674,11 +674,11 @@ curves_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), curves_ok_callback,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
_("Reset"), curves_reset_callback,
cd, NULL, NULL, FALSE, FALSE,
_("Cancel"), curves_cancel_callback,
GTK_STOCK_CANCEL, curves_cancel_callback,
cd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -462,11 +462,11 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), hue_saturation_ok_callback,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
_("Reset"), hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
_("Cancel"), hue_saturation_cancel_callback,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -367,11 +367,11 @@ threshold_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), threshold_ok_callback,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
_("Reset"), threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
_("Cancel"), threshold_cancel_callback,
GTK_STOCK_CANCEL, threshold_cancel_callback,
td, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -450,7 +450,7 @@ gimp_color_picker_tool_button_press (GimpTool *tool,
gimp_dialog_create_action_area
(GTK_DIALOG (gimp_color_picker_tool_info->shell),
_("Close"), gimp_color_picker_tool_info_window_close_callback,
GTK_STOCK_CLOSE, gimp_color_picker_tool_info_window_close_callback,
gimp_color_picker_tool_info, NULL, NULL, TRUE, FALSE,
NULL);
......
......@@ -332,7 +332,7 @@ info_window_create (GDisplay *gdisp)
/* create the action area */
gimp_dialog_create_action_area (GTK_DIALOG (info_win->shell),
_("Close"), info_window_close_callback,
GTK_STOCK_CLOSE, info_window_close_callback,
info_win, NULL, NULL, TRUE, FALSE,
NULL);
......
......@@ -315,7 +315,7 @@ module_db_browser_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), browser_popdown_callback,
GTK_STOCK_OK, browser_popdown_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -155,7 +155,7 @@ tips_dialog_create (void)
gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox);
button = gtk_button_new_with_label (_("Close"));
button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_window_set_default (GTK_WINDOW (tips_dialog), button);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
......
......@@ -529,7 +529,7 @@ user_install_dialog_create (Gimp *gimp)
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
_("Cancel"), user_install_cancel_callback,
GTK_STOCK_CANCEL, user_install_cancel_callback,
gimp, 1, &cancel_button, FALSE, TRUE,
NULL);
......
......@@ -156,9 +156,9 @@ make_dialog (ColorDisplayDialog *cdd)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), color_display_ok_callback,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
_("Cancel"), color_display_cancel_callback,
GTK_STOCK_CANCEL, color_display_cancel_callback,
cdd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -121,7 +121,7 @@ progress_start (GDisplay *gdisp,
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Cancel"), NULL,
GTK_STOCK_CANCEL, NULL,
NULL, NULL, &p->cancelbutton, TRUE, TRUE,
NULL);
......
......@@ -790,7 +790,7 @@ open_idea_window (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("Close"), idea_hide_callback,
GTK_STOCK_CLOSE, idea_hide_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -246,8 +246,6 @@ text_clicked_callback (GtkWidget *widget,
break;
case 3:
g_signal_stop_emission_by_name (G_OBJECT (text_view),
"button_press_event");
gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time);
/* wheelmouse support */
......@@ -296,7 +294,7 @@ error_console_create (void)
_("Clear"), error_console_clear_callback,
text_buffer, NULL, NULL, FALSE, FALSE,
_("Close"), error_console_close_callback,
GTK_STOCK_CLOSE, error_console_close_callback,
text_buffer, NULL, NULL, TRUE, TRUE,
NULL);
......@@ -317,17 +315,19 @@ error_console_create (void)
menuitem = gtk_menu_item_new_with_label (_("Write all errors to file..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect_swapped (G_OBJECT (menuitem), "activate",
G_CALLBACK (error_console_menu_callback),
GINT_TO_POINTER (ERRORS_ALL));
gtk_widget_show (menuitem);
menuitem = gtk_menu_item_new_with_label (_("Write selection to file..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect_swapped (G_OBJECT (menuitem), "activate",
G_CALLBACK (error_console_menu_callback),
GINT_TO_POINTER (ERRORS_SELECTION));
gtk_widget_show (menuitem);
/* The output text widget */
text_view = gtk_text_view_new_with_buffer (text_buffer);
......
......@@ -156,9 +156,9 @@ make_dialog (ColorDisplayDialog *cdd)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), color_display_ok_callback,
GTK_STOCK_OK, color_display_ok_callback,
cdd, NULL, NULL, TRUE, FALSE,
_("Cancel"), color_display_cancel_callback,
GTK_STOCK_CANCEL, color_display_cancel_callback,
cdd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -121,7 +121,7 @@ progress_start (GDisplay *gdisp,
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Cancel"), NULL,
GTK_STOCK_CANCEL, NULL,
NULL, NULL, &p->cancelbutton, TRUE, TRUE,
NULL);
......
......@@ -353,9 +353,9 @@ channels_new_channel_query (GimpImage *gimage)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("OK"), new_channel_query_ok_callback,
GTK_STOCK_OK, new_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
_("Cancel"), gtk_widget_destroy,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
......@@ -506,9 +506,9 @@ channels_edit_channel_query (GimpChannel *channel)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
_("OK"), edit_channel_query_ok_callback,
GTK_STOCK_OK, edit_channel_query_ok_callback,
options, NULL, NULL, TRUE, FALSE,
_("Cancel"), gtk_widget_destroy,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
NULL);
......
......@@ -54,3 +54,10 @@ help_context_help_cmd_callback (GtkWidget *widget,
{
gimp_context_help ();
}
void
mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
g_mem_profile ();
}
......@@ -29,5 +29,8 @@ void help_help_cmd_callback (GtkWidget *widget,
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
void mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
......@@ -3715,7 +3715,7 @@ cpopup_split_uniform_callback (GtkWidget *widget,
_("Split"), cpopup_split_uniform_split_callback,
gradient_editor, NULL, NULL, TRUE, FALSE,
_("Cancel"), cpopup_split_uniform_cancel_callback,
GTK_STOCK_CANCEL, cpopup_split_uniform_cancel_callback,
gradient_editor, NULL, NULL, FALSE, TRUE,
NULL);
......@@ -4275,7 +4275,7 @@ cpopup_replicate_callback (GtkWidget *widget,
_("Replicate"), cpopup_do_replicate_callback,
gradient_editor, NULL, NULL, FALSE, FALSE,
_("Cancel"), cpopup_replicate_cancel_callback,
GTK_STOCK_CANCEL, cpopup_replicate_cancel_callback,
gradient_editor, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -54,3 +54,10 @@ help_context_help_cmd_callback (GtkWidget *widget,
{
gimp_context_help ();
}
void
mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
g_mem_profile ();
}
......@@ -29,5 +29,8 @@ void help_help_cmd_callback (GtkWidget *widget,
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
void mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
......@@ -332,7 +332,7 @@ info_window_create (GDisplay *gdisp)
/* create the action area */
gimp_dialog_create_action_area (GTK_DIALOG (info_win->shell),
_("Close"), info_window_close_callback,
GTK_STOCK_CLOSE, info_window_close_callback,
info_win, NULL, NULL, TRUE, FALSE,
NULL);
......
......@@ -285,6 +285,14 @@ static GimpItemFactoryEntry toolbox_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:about-dialog",
"help/dialogs/about.html", NULL },
SEPARATOR ("/Help/---"),
{ { N_("/Help/Mem Profile"), NULL,
mem_profile_cmd_callback, 0 },
NULL,
NULL, NULL },
#ifdef ENABLE_DEBUG_ENTRY
{ { "/Help/Dump Items (Debug)", NULL,
menus_debug_cmd_callback, 0 },
......
......@@ -315,7 +315,7 @@ module_db_browser_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), browser_popdown_callback,
GTK_STOCK_OK, browser_popdown_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -173,7 +173,10 @@ palette_set_active_color (gint r,
gint b,
gint state)
{
/*
#ifdef __GNUC__
#warning FIXME: palette_set_active_color()
#endif
#if 0
GimpPalette *palette;
GimpRGB color;
......@@ -213,7 +216,7 @@ palette_set_active_color (gint r,
gimp_context_set_foreground (gimp_get_user_context (the_gimp), &color);
else if (active_color == BACKGROUND)
gimp_context_set_background (gimp_get_user_context (the_gimp), &color);
*/
#endif
}
/* called from palette_select.c ********************************************/
......@@ -265,8 +268,7 @@ palette_editor_new (Gimp *gimp)
NULL);
gtk_widget_hide (GTK_WIDGET (g_list_nth_data (gtk_container_children (GTK_CONTAINER (GTK_DIALOG (palette_editor->shell)->vbox)), 0)));
gtk_dialog_set_has_separator (GTK_DIALOG (palette_editor->shell), FALSE);
gtk_widget_hide (GTK_DIALOG (palette_editor->shell)->action_area);
main_vbox = gtk_vbox_new (FALSE, 1);
......@@ -300,10 +302,11 @@ palette_editor_new (Gimp *gimp)
eventbox = gtk_event_box_new ();
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow),
eventbox);
gtk_widget_show (eventbox);
gtk_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
GTK_SIGNAL_FUNC (palette_editor_eventbox_button_press),
palette_editor);
gtk_widget_show (eventbox);
alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (eventbox), alignment);
......@@ -316,13 +319,13 @@ palette_editor_new (Gimp *gimp)
gtk_preview_size (GTK_PREVIEW (palette_region), PREVIEW_WIDTH, PREVIEW_HEIGHT);
gtk_widget_set_events (palette_region, PALETTE_EVENT_MASK);
gtk_container_add (GTK_CONTAINER (alignment), palette_region);
gtk_widget_show (palette_region);
gtk_signal_connect (GTK_OBJECT (palette_editor->color_area), "event",
GTK_SIGNAL_FUNC (palette_editor_color_area_events),
palette_editor);
gtk_container_add (GTK_CONTAINER (alignment), palette_region);
gtk_widget_show (palette_region);
/* dnd stuff */
gtk_drag_source_set (palette_region,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
......@@ -351,6 +354,7 @@ palette_editor_new (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_entry_set_text (GTK_ENTRY (entry), _("Undefined"));
gtk_widget_set_sensitive (entry, FALSE);
palette_editor->entry_sig_id =
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (palette_editor_color_name_changed),
......@@ -359,17 +363,19 @@ palette_editor_new (Gimp *gimp)
/* + and - buttons */
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (palette_editor_zoomin_callback),
palette_editor);
gtk_widget_show (button);
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (palette_editor_zoomout_callback),
palette_editor);
gtk_widget_show (button);
gtk_signal_connect (GTK_OBJECT (palette_editor->context), "palette_changed",
GTK_SIGNAL_FUNC (palette_editor_palette_changed),
......@@ -424,27 +430,29 @@ palette_editor_create_popup_menu (PaletteEditor *palette_editor)
menu_item = gtk_menu_item_new_with_label (_("New"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (palette_editor_new_entry_callback),
palette_editor);
gtk_widget_show (menu_item);
menu_item = gtk_menu_item_new_with_label (_("Edit"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (palette_editor_edit_entry_callback),
palette_editor);
gtk_widget_show (menu_item);
palette_editor->edit_menu_item = menu_item;
menu_item = gtk_menu_item_new_with_label (_("Delete"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (palette_editor_delete_entry_callback),
palette_editor);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
palette_editor->delete_menu_item = menu_item;
}
......@@ -537,7 +545,7 @@ palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
GimpContext *user_context;
GimpPalette *palette;
palette_editor = data;
palette_editor = (PaletteEditor *) data;
palette = gimp_context_get_palette (palette_editor->context);
......
......@@ -155,7 +155,7 @@ tips_dialog_create (void)
gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox);
button = gtk_button_new_with_label (_("Close"));
button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_window_set_default (GTK_WINDOW (tips_dialog), button);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
......
......@@ -529,7 +529,7 @@ user_install_dialog_create (Gimp *gimp)
_("Continue"), user_install_continue_callback,
gimp, NULL, &continue_button, TRUE, FALSE,
_("Cancel"), user_install_cancel_callback,
GTK_STOCK_CANCEL, user_install_cancel_callback,
gimp, 1, &cancel_button, FALSE, TRUE,
NULL);
......
......@@ -109,7 +109,10 @@ main (int argc,
gchar *display_env;
#endif
#if 0
g_mem_set_vtable (glib_mem_profiler_table);
g_atexit (g_mem_profile);
#endif
/* Initialize variables */
......
......@@ -285,6 +285,14 @@ static GimpItemFactoryEntry toolbox_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:about-dialog",
"help/dialogs/about.html", NULL },
SEPARATOR ("/Help/---"),
{ { N_("/Help/Mem Profile"), NULL,
mem_profile_cmd_callback, 0 },
NULL,
NULL, NULL },
#ifdef ENABLE_DEBUG_ENTRY
{ { "/Help/Dump Items (Debug)", NULL,
menus_debug_cmd_callback, 0 },
......
......@@ -315,7 +315,7 @@ module_db_browser_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), browser_popdown_callback,
GTK_STOCK_OK, browser_popdown_callback,
NULL, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -299,11 +299,11 @@ brightness_contrast_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), brightness_contrast_ok_callback,
GTK_STOCK_OK, brightness_contrast_ok_callback,
bcd, NULL, NULL, TRUE, FALSE,
_("Reset"), brightness_contrast_reset_callback,
bcd, NULL, NULL, TRUE, FALSE,
_("Cancel"), brightness_contrast_cancel_callback,
GTK_STOCK_CANCEL, brightness_contrast_cancel_callback,
bcd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -844,7 +844,7 @@ by_color_select_dialog_new (void)
_("Reset"), by_color_select_reset_callback,
bcd, NULL, NULL, FALSE, FALSE,
_("Close"), by_color_select_close_callback,
GTK_STOCK_CLOSE, by_color_select_close_callback,
bcd, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -358,11 +358,11 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), color_balance_ok_callback,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
_("Reset"), color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
_("Cancel"), color_balance_cancel_callback,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -450,7 +450,7 @@ gimp_color_picker_tool_button_press (GimpTool *tool,
gimp_dialog_create_action_area
(GTK_DIALOG (gimp_color_picker_tool_info->shell),
_("Close"), gimp_color_picker_tool_info_window_close_callback,
GTK_STOCK_CLOSE, gimp_color_picker_tool_info_window_close_callback,
gimp_color_picker_tool_info, NULL, NULL, TRUE, FALSE,
NULL);
......
......@@ -897,7 +897,7 @@ crop_info_create (GimpTool *tool)
NULL, NULL, NULL, TRUE, FALSE,
_("Resize"), crop_resize_callback,
NULL, NULL, NULL, FALSE, FALSE,
_("Close"), crop_close_callback,
GTK_STOCK_CLOSE, crop_close_callback,
NULL, NULL, NULL, FALSE, FALSE,
NULL);
......
......@@ -674,11 +674,11 @@ curves_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), curves_ok_callback,
GTK_STOCK_OK, curves_ok_callback,
cd, NULL, NULL, TRUE, FALSE,
_("Reset"), curves_reset_callback,
cd, NULL, NULL, FALSE, FALSE,
_("Cancel"), curves_cancel_callback,
GTK_STOCK_CANCEL, curves_cancel_callback,
cd, NULL, NULL, FALSE, TRUE,
NULL);
......
......@@ -360,7 +360,7 @@ histogram_tool_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("Close"), histogram_tool_close_callback,
GTK_STOCK_CLOSE, histogram_tool_close_callback,
htd, NULL, NULL, TRUE, TRUE,
NULL);
......
......@@ -462,11 +462,11 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
_("OK"), hue_saturation_ok_callback,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
_("Reset"), hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
_("Cancel"), hue_saturation_cancel_callback,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
NULL);
......