diff --git a/ChangeLog b/ChangeLog index 2434e306ea..d6970a5eed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,57 @@ +2001-08-03 Michael Natterer + + * 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 * app/tools/gimptexttool.c: diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c index 4161143f34..1b8ac32d81 100644 --- a/app/actions/channels-commands.c +++ b/app/actions/channels-commands.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); diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c index 0548882b90..6d82a2aeaf 100644 --- a/app/actions/help-commands.c +++ b/app/actions/help-commands.c @@ -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 (); +} diff --git a/app/actions/help-commands.h b/app/actions/help-commands.h index c5224b4009..e24a91b682 100644 --- a/app/actions/help-commands.h +++ b/app/actions/help-commands.h @@ -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__ */ diff --git a/app/base/color-balance.c b/app/base/color-balance.c index ead379c586..0c7e78ce40 100644 --- a/app/base/color-balance.c +++ b/app/base/color-balance.c @@ -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); diff --git a/app/base/curves.c b/app/base/curves.c index 1d72fc9d9f..f1d304b1ab 100644 --- a/app/base/curves.c +++ b/app/base/curves.c @@ -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); diff --git a/app/base/hue-saturation.c b/app/base/hue-saturation.c index 3ca8cdb8de..fc1e127bf6 100644 --- a/app/base/hue-saturation.c +++ b/app/base/hue-saturation.c @@ -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); diff --git a/app/base/threshold.c b/app/base/threshold.c index bdb459d51d..efda352df3 100644 --- a/app/base/threshold.c +++ b/app/base/threshold.c @@ -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); diff --git a/app/core/gimpimage-pick-color.c b/app/core/gimpimage-pick-color.c index 0e415fc28c..bcd3c0b2f2 100644 --- a/app/core/gimpimage-pick-color.c +++ b/app/core/gimpimage-pick-color.c @@ -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); diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index 3f11f69cec..50f949d8d2 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -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); diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index da7ae1964a..689e9a40d3 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -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); diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index 945367d685..d4aa6ec446 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -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", diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index dbb811f66c..09be3e8979 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -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); diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 856bea5f0f..104a64c071 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -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); diff --git a/app/display/gimpprogress.c b/app/display/gimpprogress.c index f71f93672e..1b50cedeca 100644 --- a/app/display/gimpprogress.c +++ b/app/display/gimpprogress.c @@ -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); diff --git a/app/docindex.c b/app/docindex.c index 7f0e71102c..01c4100e0a 100644 --- a/app/docindex.c +++ b/app/docindex.c @@ -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); diff --git a/app/errorconsole.c b/app/errorconsole.c index 1741cbae86..3df5526d5c 100644 --- a/app/errorconsole.c +++ b/app/errorconsole.c @@ -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); diff --git a/app/gdisplay_color_ui.c b/app/gdisplay_color_ui.c index 856bea5f0f..104a64c071 100644 --- a/app/gdisplay_color_ui.c +++ b/app/gdisplay_color_ui.c @@ -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); diff --git a/app/gimpprogress.c b/app/gimpprogress.c index f71f93672e..1b50cedeca 100644 --- a/app/gimpprogress.c +++ b/app/gimpprogress.c @@ -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); diff --git a/app/gui/channels-commands.c b/app/gui/channels-commands.c index 4161143f34..1b8ac32d81 100644 --- a/app/gui/channels-commands.c +++ b/app/gui/channels-commands.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); diff --git a/app/gui/commands.c b/app/gui/commands.c index 0548882b90..6d82a2aeaf 100644 --- a/app/gui/commands.c +++ b/app/gui/commands.c @@ -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 (); +} diff --git a/app/gui/commands.h b/app/gui/commands.h index c5224b4009..e24a91b682 100644 --- a/app/gui/commands.h +++ b/app/gui/commands.h @@ -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__ */ diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index f6602fee1e..35ab2e9a57 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -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); diff --git a/app/gui/help-commands.c b/app/gui/help-commands.c index 0548882b90..6d82a2aeaf 100644 --- a/app/gui/help-commands.c +++ b/app/gui/help-commands.c @@ -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 (); +} diff --git a/app/gui/help-commands.h b/app/gui/help-commands.h index c5224b4009..e24a91b682 100644 --- a/app/gui/help-commands.h +++ b/app/gui/help-commands.h @@ -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__ */ diff --git a/app/gui/info-window.c b/app/gui/info-window.c index 3f11f69cec..50f949d8d2 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -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); diff --git a/app/gui/menus.c b/app/gui/menus.c index 44f3f4b1ef..c016691931 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -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 }, diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index da7ae1964a..689e9a40d3 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -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); diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 2218e5971c..ab57008644 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -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); diff --git a/app/gui/tips-dialog.c b/app/gui/tips-dialog.c index 945367d685..d4aa6ec446 100644 --- a/app/gui/tips-dialog.c +++ b/app/gui/tips-dialog.c @@ -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", diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index dbb811f66c..09be3e8979 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -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); diff --git a/app/main.c b/app/main.c index da32f8c205..954bd3901d 100644 --- a/app/main.c +++ b/app/main.c @@ -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 */ diff --git a/app/menus/menus.c b/app/menus/menus.c index 44f3f4b1ef..c016691931 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -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 }, diff --git a/app/module_db.c b/app/module_db.c index da7ae1964a..689e9a40d3 100644 --- a/app/module_db.c +++ b/app/module_db.c @@ -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); diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c index 61475fe913..d009c03944 100644 --- a/app/tools/gimpbrightnesscontrasttool.c +++ b/app/tools/gimpbrightnesscontrasttool.c @@ -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); diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index 1ae7963319..d06d6d8812 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -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); diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index ead379c586..0c7e78ce40 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -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); diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 0e415fc28c..bcd3c0b2f2 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -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); diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 69122e01de..74a4b41c95 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -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); diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 1d72fc9d9f..f1d304b1ab 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -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); diff --git a/app/tools/gimphistogramtool.c b/app/tools/gimphistogramtool.c index 0beb302625..fd46ff3123 100644 --- a/app/tools/gimphistogramtool.c +++ b/app/tools/gimphistogramtool.c @@ -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); diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 3ca8cdb8de..fc1e127bf6 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -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); diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index 60c263b01e..4cbbc73c3b 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -436,11 +436,11 @@ levels_dialog_new (void) GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, - _("OK"), levels_ok_callback, + GTK_STOCK_OK, levels_ok_callback, ld, NULL, NULL, TRUE, FALSE, _("Reset"), levels_reset_callback, ld, NULL, NULL, FALSE, FALSE, - _("Cancel"), levels_cancel_callback, + GTK_STOCK_CANCEL, levels_cancel_callback, ld, NULL, NULL, FALSE, TRUE, NULL); diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 8046d5f9e4..5d312e7ea5 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -396,7 +396,7 @@ gimp_measure_tool_button_press (GimpTool *tool, gimp_dialog_create_action_area (GTK_DIALOG (measure_tool_info->shell), - _("Close"), + GTK_STOCK_CLOSE, measure_tool_info_window_close_callback, measure_tool_info, NULL, NULL, TRUE, FALSE, diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c index 82bf635fc0..995582b564 100644 --- a/app/tools/gimpposterizetool.c +++ b/app/tools/gimpposterizetool.c @@ -279,11 +279,11 @@ posterize_dialog_new (void) GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, - _("OK"), posterize_ok_callback, + GTK_STOCK_OK, posterize_ok_callback, pd, NULL, NULL, TRUE, FALSE, _("Reset"), posterize_reset_callback, pd, NULL, NULL, TRUE, FALSE, - _("Cancel"), posterize_cancel_callback, + GTK_STOCK_CANCEL, posterize_cancel_callback, pd, NULL, NULL, FALSE, TRUE, NULL); diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c index bdb459d51d..efda352df3 100644 --- a/app/tools/gimpthresholdtool.c +++ b/app/tools/gimpthresholdtool.c @@ -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); diff --git a/app/undo_history.c b/app/undo_history.c index 5c3da7677b..715644c48a 100644 --- a/app/undo_history.c +++ b/app/undo_history.c @@ -805,7 +805,7 @@ undo_history_new (GimpImage *gimage) GTK_WIN_POS_NONE, FALSE, TRUE, FALSE, - _("Close"), undo_history_close_callback, + GTK_STOCK_CLOSE, undo_history_close_callback, st, NULL, NULL, TRUE, TRUE, NULL); diff --git a/app/user_install.c b/app/user_install.c index dbb811f66c..09be3e8979 100644 --- a/app/user_install.c +++ b/app/user_install.c @@ -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); diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index 856bea5f0f..104a64c071 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -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); diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c index 0fa9c0e22a..d708e33f78 100644 --- a/app/widgets/gimpcontainereditor.c +++ b/app/widgets/gimpcontainereditor.c @@ -38,7 +38,10 @@ static void gimp_container_editor_class_init (GimpContainerEditorClass *klass); static void gimp_container_editor_init (GimpContainerEditor *view); + static void gimp_container_editor_destroy (GtkObject *object); +static void gimp_container_editor_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_container_editor_viewable_dropped (GtkWidget *widget, GimpViewable *viewable, @@ -63,10 +66,10 @@ static void gimp_container_editor_real_context_item(GimpContainerEditor *edito static GtkVBoxClass *parent_class = NULL; -GtkType +GType gimp_container_editor_get_type (void) { - static guint view_type = 0; + static GType view_type = 0; if (! view_type) { @@ -92,16 +95,36 @@ static void gimp_container_editor_class_init (GimpContainerEditorClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; - parent_class = gtk_type_class (GTK_TYPE_VBOX); + parent_class = g_type_class_peek_parent (klass); - object_class->destroy = gimp_container_editor_destroy; + object_class->destroy = gimp_container_editor_destroy; - klass->select_item = NULL; - klass->activate_item = NULL; - klass->context_item = gimp_container_editor_real_context_item; + widget_class->style_set = gimp_container_editor_style_set; + + klass->select_item = NULL; + klass->activate_item = NULL; + klass->context_item = gimp_container_editor_real_context_item; + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("content_spacing", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("button_spacing", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); } static void @@ -128,6 +151,28 @@ gimp_container_editor_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_container_editor_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint content_spacing; + gint button_spacing; + + gtk_widget_style_get (widget, + "content_spacing", + &content_spacing, + "button_spacing", + &button_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (widget), content_spacing); + gtk_box_set_spacing (GTK_BOX (GIMP_CONTAINER_EDITOR (widget)->button_box), + button_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + gboolean gimp_container_editor_construct (GimpContainerEditor *editor, GimpViewType view_type, diff --git a/app/widgets/gimpcontainereditor.h b/app/widgets/gimpcontainereditor.h index 6567b12775..1de91c2967 100644 --- a/app/widgets/gimpcontainereditor.h +++ b/app/widgets/gimpcontainereditor.h @@ -69,7 +69,7 @@ struct _GimpContainerEditorClass }; -GType gimp_container_editor_get_type (void); +GType gimp_container_editor_get_type (void); /* protected */ diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c index 4e0cf68915..e3d71e8337 100644 --- a/app/widgets/gimpcontainerview.c +++ b/app/widgets/gimpcontainerview.c @@ -52,7 +52,10 @@ enum static void gimp_container_view_class_init (GimpContainerViewClass *klass); static void gimp_container_view_init (GimpContainerView *panel); + static void gimp_container_view_destroy (GtkObject *object); +static void gimp_container_view_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_container_view_real_set_container (GimpContainerView *view, GimpContainer *container); @@ -115,8 +118,10 @@ static void gimp_container_view_class_init (GimpContainerViewClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -217,6 +222,8 @@ gimp_container_view_class_init (GimpContainerViewClass *klass) object_class->destroy = gimp_container_view_destroy; + widget_class->style_set = gimp_container_view_style_set; + klass->set_container = gimp_container_view_real_set_container; klass->insert_item = NULL; klass->remove_item = NULL; @@ -226,6 +233,22 @@ gimp_container_view_class_init (GimpContainerViewClass *klass) klass->context_item = NULL; klass->clear_items = gimp_container_view_real_clear_items; klass->set_preview_size = NULL; + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("content_spacing", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("button_spacing", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); } static void @@ -262,6 +285,23 @@ gimp_container_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_container_view_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint content_spacing; + + gtk_widget_style_get (widget, + "content_spacing", + &content_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (widget), content_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + void gimp_container_view_set_container (GimpContainerView *view, GimpContainer *container) diff --git a/app/widgets/gimpcontainerview.h b/app/widgets/gimpcontainerview.h index 111c2be6fa..d26855a57a 100644 --- a/app/widgets/gimpcontainerview.h +++ b/app/widgets/gimpcontainerview.h @@ -79,7 +79,7 @@ struct _GimpContainerViewClass }; -GtkType gimp_container_view_get_type (void); +GType gimp_container_view_get_type (void); void gimp_container_view_set_container (GimpContainerView *view, GimpContainer *container); diff --git a/app/widgets/gimpdatafactoryview.c b/app/widgets/gimpdatafactoryview.c index 84d4851dd1..1901a1aae4 100644 --- a/app/widgets/gimpdatafactoryview.c +++ b/app/widgets/gimpdatafactoryview.c @@ -411,7 +411,7 @@ gimp_data_factory_view_delete_clicked (GtkWidget *widget, gimp_standard_help_func, NULL, FALSE, str, - _("Delete"), _("Cancel"), + _("Delete"), GTK_STOCK_CANCEL, G_OBJECT (data), "destroy", gimp_data_factory_view_delete_callback, diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index 7cc99ba836..0629bb35b3 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -31,13 +31,21 @@ #include "gimpdockbook.h" -static void gimp_dockable_class_init (GimpDockableClass *klass); -static void gimp_dockable_init (GimpDockable *dockable); +static void gimp_dockable_class_init (GimpDockableClass *klass); +static void gimp_dockable_init (GimpDockable *dockable); -static void gimp_dockable_destroy (GtkObject *object); +static void gimp_dockable_destroy (GtkObject *object); +static void gimp_dockable_style_set (GtkWidget *widget, + GtkStyle *prev_style); + +static GtkWidget * gimp_dockable_real_get_tab_widget (GimpDockable *dockable, + GimpDockbook *dockbook, + gint size); +static void gimp_dockable_real_set_context (GimpDockable *dockable, + GimpContext *context); -static GtkBinClass *parent_class = NULL; +static GtkVBoxClass *parent_class = NULL; GType @@ -69,12 +77,35 @@ static void gimp_dockable_class_init (GimpDockableClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; parent_class = g_type_class_peek_parent (klass); - object_class->destroy = gimp_dockable_destroy; + object_class->destroy = gimp_dockable_destroy; + + widget_class->style_set = gimp_dockable_style_set; + + klass->get_tab_widget = gimp_dockable_real_get_tab_widget; + klass->set_context = gimp_dockable_real_set_context; + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("content_border", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_int ("content_spacing", + NULL, NULL, + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); } static void @@ -114,6 +145,27 @@ gimp_dockable_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_dockable_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint content_border; + gint content_spacing; + + gtk_widget_style_get (widget, + "content_border", + &content_border, + "content_spacing", + &content_spacing, + NULL); + + gtk_container_set_border_width (GTK_CONTAINER (widget), content_border); + gtk_box_set_spacing (GTK_BOX (widget), content_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + GtkWidget * gimp_dockable_new (const gchar *name, const gchar *short_name, @@ -145,12 +197,9 @@ gimp_dockable_get_tab_widget (GimpDockable *dockable, g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL); g_return_val_if_fail (size >= -1 && size < 64, NULL); - if (dockable->get_tab_func) - { - return dockable->get_tab_func (dockable, dockbook, size); - } - - return gtk_label_new (dockable->short_name); + return GIMP_DOCKABLE_GET_CLASS (dockable)->get_tab_widget (dockable, + dockbook, + size); } void @@ -162,11 +211,39 @@ gimp_dockable_set_context (GimpDockable *dockable, if (context != dockable->context) { - if (dockable->set_context_func) - { - dockable->set_context_func (dockable, context); - } - - dockable->context = context; + GIMP_DOCKABLE_GET_CLASS (dockable)->set_context (dockable, + context); } } + +static GtkWidget * +gimp_dockable_real_get_tab_widget (GimpDockable *dockable, + GimpDockbook *dockbook, + gint size) +{ + g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL); + g_return_val_if_fail (GIMP_IS_DOCKBOOK (dockbook), NULL); + g_return_val_if_fail (size >= -1 && size < 64, NULL); + + if (dockable->get_tab_func) + { + return dockable->get_tab_func (dockable, dockbook, size); + } + + return gtk_label_new (dockable->short_name); +} + +static void +gimp_dockable_real_set_context (GimpDockable *dockable, + GimpContext *context) +{ + g_return_if_fail (GIMP_IS_DOCKABLE (dockable)); + g_return_if_fail (! context || GIMP_IS_CONTEXT (context)); + + if (dockable->set_context_func) + { + dockable->set_context_func (dockable, context); + } + + dockable->context = context; +} diff --git a/app/widgets/gimpdockable.h b/app/widgets/gimpdockable.h index 9238281948..68f31b4268 100644 --- a/app/widgets/gimpdockable.h +++ b/app/widgets/gimpdockable.h @@ -62,6 +62,12 @@ struct _GimpDockable struct _GimpDockableClass { GtkVBoxClass parent_class; + + GtkWidget * (* get_tab_widget) (GimpDockable *dockable, + GimpDockbook *dockbook, + gint size); + void (* set_context) (GimpDockable *dockable, + GimpContext *context); }; diff --git a/app/widgets/gimpdrawablelistview.c b/app/widgets/gimpdrawablelistview.c index 28dfb8c073..678e0f6645 100644 --- a/app/widgets/gimpdrawablelistview.c +++ b/app/widgets/gimpdrawablelistview.c @@ -64,6 +64,8 @@ enum static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass); static void gimp_drawable_list_view_init (GimpDrawableListView *view); static void gimp_drawable_list_view_destroy (GtkObject *object); +static void gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_drawable_list_view_real_set_image (GimpDrawableListView *view, GimpImage *gimage); @@ -169,9 +171,11 @@ static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; GimpContainerViewClass *container_view_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; container_view_class = (GimpContainerViewClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -188,6 +192,8 @@ gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) object_class->destroy = gimp_drawable_list_view_destroy; + widget_class->style_set = gimp_drawable_list_view_style_set; + container_view_class->insert_item = gimp_drawable_list_view_insert_item; container_view_class->select_item = gimp_drawable_list_view_select_item; container_view_class->activate_item = gimp_drawable_list_view_activate_item; @@ -349,6 +355,24 @@ gimp_drawable_list_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint button_spacing; + + gtk_widget_style_get (widget, + "button_spacing", + &button_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (GIMP_DRAWABLE_LIST_VIEW (widget)->button_box), + button_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpdrawablelistview.h b/app/widgets/gimpdrawablelistview.h index d0696742d1..1a269fb07e 100644 --- a/app/widgets/gimpdrawablelistview.h +++ b/app/widgets/gimpdrawablelistview.h @@ -96,7 +96,7 @@ struct _GimpDrawableListViewClass }; -GtkType gimp_drawable_list_view_get_type (void); +GType gimp_drawable_list_view_get_type (void); GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c index 28dfb8c073..678e0f6645 100644 --- a/app/widgets/gimpdrawabletreeview.c +++ b/app/widgets/gimpdrawabletreeview.c @@ -64,6 +64,8 @@ enum static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass); static void gimp_drawable_list_view_init (GimpDrawableListView *view); static void gimp_drawable_list_view_destroy (GtkObject *object); +static void gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_drawable_list_view_real_set_image (GimpDrawableListView *view, GimpImage *gimage); @@ -169,9 +171,11 @@ static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; GimpContainerViewClass *container_view_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; container_view_class = (GimpContainerViewClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -188,6 +192,8 @@ gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) object_class->destroy = gimp_drawable_list_view_destroy; + widget_class->style_set = gimp_drawable_list_view_style_set; + container_view_class->insert_item = gimp_drawable_list_view_insert_item; container_view_class->select_item = gimp_drawable_list_view_select_item; container_view_class->activate_item = gimp_drawable_list_view_activate_item; @@ -349,6 +355,24 @@ gimp_drawable_list_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint button_spacing; + + gtk_widget_style_get (widget, + "button_spacing", + &button_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (GIMP_DRAWABLE_LIST_VIEW (widget)->button_box), + button_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpdrawabletreeview.h b/app/widgets/gimpdrawabletreeview.h index d0696742d1..1a269fb07e 100644 --- a/app/widgets/gimpdrawabletreeview.h +++ b/app/widgets/gimpdrawabletreeview.h @@ -96,7 +96,7 @@ struct _GimpDrawableListViewClass }; -GtkType gimp_drawable_list_view_get_type (void); +GType gimp_drawable_list_view_get_type (void); GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index f6602fee1e..35ab2e9a57 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -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); diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index 44f3f4b1ef..c016691931 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -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 }, diff --git a/app/widgets/gimpitemlistview.c b/app/widgets/gimpitemlistview.c index 28dfb8c073..678e0f6645 100644 --- a/app/widgets/gimpitemlistview.c +++ b/app/widgets/gimpitemlistview.c @@ -64,6 +64,8 @@ enum static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass); static void gimp_drawable_list_view_init (GimpDrawableListView *view); static void gimp_drawable_list_view_destroy (GtkObject *object); +static void gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_drawable_list_view_real_set_image (GimpDrawableListView *view, GimpImage *gimage); @@ -169,9 +171,11 @@ static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; GimpContainerViewClass *container_view_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; container_view_class = (GimpContainerViewClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -188,6 +192,8 @@ gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) object_class->destroy = gimp_drawable_list_view_destroy; + widget_class->style_set = gimp_drawable_list_view_style_set; + container_view_class->insert_item = gimp_drawable_list_view_insert_item; container_view_class->select_item = gimp_drawable_list_view_select_item; container_view_class->activate_item = gimp_drawable_list_view_activate_item; @@ -349,6 +355,24 @@ gimp_drawable_list_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint button_spacing; + + gtk_widget_style_get (widget, + "button_spacing", + &button_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (GIMP_DRAWABLE_LIST_VIEW (widget)->button_box), + button_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpitemlistview.h b/app/widgets/gimpitemlistview.h index d0696742d1..1a269fb07e 100644 --- a/app/widgets/gimpitemlistview.h +++ b/app/widgets/gimpitemlistview.h @@ -96,7 +96,7 @@ struct _GimpDrawableListViewClass }; -GtkType gimp_drawable_list_view_get_type (void); +GType gimp_drawable_list_view_get_type (void); GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index 28dfb8c073..678e0f6645 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -64,6 +64,8 @@ enum static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass); static void gimp_drawable_list_view_init (GimpDrawableListView *view); static void gimp_drawable_list_view_destroy (GtkObject *object); +static void gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style); static void gimp_drawable_list_view_real_set_image (GimpDrawableListView *view, GimpImage *gimage); @@ -169,9 +171,11 @@ static void gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; GimpContainerViewClass *container_view_class; object_class = (GtkObjectClass *) klass; + widget_class = (GtkWidgetClass *) klass; container_view_class = (GimpContainerViewClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -188,6 +192,8 @@ gimp_drawable_list_view_class_init (GimpDrawableListViewClass *klass) object_class->destroy = gimp_drawable_list_view_destroy; + widget_class->style_set = gimp_drawable_list_view_style_set; + container_view_class->insert_item = gimp_drawable_list_view_insert_item; container_view_class->select_item = gimp_drawable_list_view_select_item; container_view_class->activate_item = gimp_drawable_list_view_activate_item; @@ -349,6 +355,24 @@ gimp_drawable_list_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (parent_class)->destroy (object); } +static void +gimp_drawable_list_view_style_set (GtkWidget *widget, + GtkStyle *prev_style) +{ + gint button_spacing; + + gtk_widget_style_get (widget, + "button_spacing", + &button_spacing, + NULL); + + gtk_box_set_spacing (GTK_BOX (GIMP_DRAWABLE_LIST_VIEW (widget)->button_box), + button_spacing); + + if (GTK_WIDGET_CLASS (parent_class)->style_set) + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); +} + GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimpitemtreeview.h b/app/widgets/gimpitemtreeview.h index d0696742d1..1a269fb07e 100644 --- a/app/widgets/gimpitemtreeview.h +++ b/app/widgets/gimpitemtreeview.h @@ -96,7 +96,7 @@ struct _GimpDrawableListViewClass }; -GtkType gimp_drawable_list_view_get_type (void); +GType gimp_drawable_list_view_get_type (void); GtkWidget * gimp_drawable_list_view_new (gint preview_size, GimpImage *gimage, diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 2218e5971c..ab57008644 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -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); diff --git a/gtkrc b/gtkrc index 42685b3846..56006d45ac 100644 --- a/gtkrc +++ b/gtkrc @@ -44,6 +44,18 @@ style "gimp-ruler" class "*Ruler*" style "gimp-ruler" +style "gimp-dock-style" +{ + GimpDockable::content_border = 2 + GimpContainerView::content_spacing = 2 + GimpContainerView::button_spacing = 2 + GimpContainerEditor::content_spacing = 2 + GimpContainerEditor::button_spacing = 2 +} + +widget "*GimpDock*" style "gimp-dock-style" + + style "gimp-tooltips" { fg[NORMAL] = { 0.0, 0.0, 0.0 } diff --git a/plug-ins/FractalExplorer/Dialogs.c b/plug-ins/FractalExplorer/Dialogs.c index 52d3e759fb..8b0ff5189b 100644 --- a/plug-ins/FractalExplorer/Dialogs.c +++ b/plug-ins/FractalExplorer/Dialogs.c @@ -282,9 +282,9 @@ explorer_dialog (void) _("About"), explorer_logo_dialog, NULL, NULL, NULL, FALSE, FALSE, - _("OK"), dialog_ok_callback, + GTK_STOCK_OK, dialog_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); @@ -1375,7 +1375,7 @@ explorer_logo_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), gtk_widget_destroy, + GTK_STOCK_OK, gtk_widget_destroy, NULL, 1, NULL, TRUE, TRUE, NULL); diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index 9a6af82f99..407931e5c4 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -738,7 +738,7 @@ delete_fractal_callback (GtkWidget *widget, "filters/fractalexplorer.html", FALSE, str, - _("Delete"), _("Cancel"), + GTK_STOCK_DELETE, GTK_STOCK_CANCEL, G_OBJECT (widget), "destroy", delete_dialog_callback, data); @@ -844,7 +844,7 @@ fractalexplorer_dialog_edit_list (GtkWidget *lwidget, gtk_widget_show (options->name_entry); gtk_widget_show (hbox); - button = gtk_button_new_with_label (_("OK")); + button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc)fractalexplorer_list_ok_callback, options); @@ -853,7 +853,7 @@ fractalexplorer_dialog_edit_list (GtkWidget *lwidget, gtk_widget_grab_default (button); gtk_widget_show (button); - button = gtk_button_new_with_label (_("Cancel")); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc)fractalexplorer_list_cancel_callback, options); @@ -1463,9 +1463,9 @@ fractalexplorer_rescan_list (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), fractalexplorer_rescan_ok_callback, + GTK_STOCK_OK, fractalexplorer_rescan_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/Lighting/lighting_ui.c b/plug-ins/Lighting/lighting_ui.c index 42b7e0362d..b115d4ad9e 100644 --- a/plug-ins/Lighting/lighting_ui.c +++ b/plug-ins/Lighting/lighting_ui.c @@ -1138,9 +1138,9 @@ main_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), apply_callback, + GTK_STOCK_OK, apply_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_main_quit, + GTK_STOCK_CANCEL, gtk_main_quit, NULL, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/MapObject/mapobject_ui.c index 9b8012780c..cdaa15200d 100644 --- a/plug-ins/MapObject/mapobject_ui.c +++ b/plug-ins/MapObject/mapobject_ui.c @@ -1384,9 +1384,9 @@ main_dialog (GimpDrawable *drawable) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), apply_callback, + GTK_STOCK_OK, apply_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_main_quit, + GTK_STOCK_CANCEL, gtk_main_quit, NULL, NULL, NULL, FALSE, TRUE, NULL); diff --git a/plug-ins/bmp/bmpwrite.c b/plug-ins/bmp/bmpwrite.c index b53b2aa189..4b6c014105 100644 --- a/plug-ins/bmp/bmpwrite.c +++ b/plug-ins/bmp/bmpwrite.c @@ -557,9 +557,9 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), save_ok_callback, + GTK_STOCK_OK, save_ok_callback, NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_destroy, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, NULL);