diff --git a/.gitignore b/.gitignore index f354cbfba3..5454dab1b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ - - /ChangeLog /.anjuta/ /.anjuta_sym_db.db @@ -10,6 +8,9 @@ *.patch /app/ +*.la +*.lo +*.o /Makefile /Makefile.in @@ -28,9 +29,9 @@ /configure /depcomp /gimp-2.0.pc +/gimp-zip /gimpthumb-2.0.pc /gimpui-2.0.pc -/gimp-zip /gtk-doc.make /install-sh /intltool-extract @@ -48,6 +49,3 @@ /stamp-h /stamp-h.in /stamp-h1 -*.la -*.lo -*.o diff --git a/NEWS b/NEWS index 2d5cf57da7..846ba00b67 100644 --- a/NEWS +++ b/NEWS @@ -73,3 +73,9 @@ Core: PDB: - Add procedures to manipulate size of text box + +General: + + - Changed licence to (L)GPLv3+ + - Use the automake 1.11 feature 'silent build rules' by default + - Lots of bug fixes and cleanup diff --git a/app/actions/actions.c b/app/actions/actions.c index f5b86b99af..f84b27c96d 100644 --- a/app/actions/actions.c +++ b/app/actions/actions.c @@ -24,8 +24,6 @@ #include "actions-types.h" -#include "config/gimpguiconfig.h" - #include "core/gimp.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" @@ -227,16 +225,12 @@ static const GimpActionFactoryEntry action_groups[] = void actions_init (Gimp *gimp) { - GimpGuiConfig *gui_config; - gint i; + gint i; g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (global_action_factory == NULL); - gui_config = GIMP_GUI_CONFIG (gimp->config); - - global_action_factory = gimp_action_factory_new (gimp, - gui_config->menu_mnemonics); + global_action_factory = gimp_action_factory_new (gimp); for (i = 0; i < G_N_ELEMENTS (action_groups); i++) gimp_action_factory_group_register (global_action_factory, diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 5895e279cf..5aed984f29 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -483,7 +483,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Instructions */ @@ -585,7 +586,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action, /* The main vbox */ vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Instructions */ diff --git a/app/base/levels.c b/app/base/levels.c index 4be2da68aa..16fff75db1 100644 --- a/app/base/levels.c +++ b/app/base/levels.c @@ -90,12 +90,12 @@ levels_lut_func (Levels *levels, inten = (gdouble) (255.0 * inten - levels->low_input[j]); } + /* clamp to new black and white points */ + inten = CLAMP (inten, 0.0, 1.0); + if (levels->gamma[j] != 0.0) { - if (inten >= 0.0) - inten = pow ( inten, (1.0 / levels->gamma[j])); - else - inten = -pow (-inten, (1.0 / levels->gamma[j])); + inten = pow ( inten, (1.0 / levels->gamma[j])); } /* determine the output intensity */ diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index e84b6c870a..2af33b3491 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -64,7 +64,6 @@ enum PROP_CAN_CHANGE_ACCELS, PROP_SAVE_ACCELS, PROP_RESTORE_ACCELS, - PROP_MENU_MNEMONICS, PROP_LAST_OPENED_SIZE, PROP_MAX_NEW_IMAGE_SIZE, PROP_TOOLBOX_COLOR_AREA, @@ -87,6 +86,7 @@ enum /* ignored, only for backward compatibility: */ PROP_INFO_WINDOW_PER_DISPLAY, + PROP_MENU_MNEMONICS, PROP_SHOW_TOOL_TIPS, PROP_SHOW_TIPS }; @@ -177,11 +177,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) "restore-accels", RESTORE_ACCELS_BLURB, TRUE, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MENU_MNEMONICS, - "menu-mnemonics", MENU_MNEMONICS_BLURB, - TRUE, - GIMP_PARAM_STATIC_STRINGS | - GIMP_CONFIG_PARAM_RESTART); GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_LAST_OPENED_SIZE, "last-opened-size", LAST_OPENED_SIZE_BLURB, 0, 1024, 10, @@ -286,6 +281,11 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) FALSE, GIMP_PARAM_STATIC_STRINGS | GIMP_CONFIG_PARAM_IGNORE); + GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MENU_MNEMONICS, + "menu-mnemonics", MENU_MNEMONICS_BLURB, + TRUE, + GIMP_PARAM_STATIC_STRINGS | + GIMP_CONFIG_PARAM_IGNORE); GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_TOOL_TIPS, "show-tool-tips", NULL, FALSE, @@ -366,9 +366,6 @@ gimp_gui_config_set_property (GObject *object, case PROP_RESTORE_ACCELS: gui_config->restore_accels = g_value_get_boolean (value); break; - case PROP_MENU_MNEMONICS: - gui_config->menu_mnemonics = g_value_get_boolean (value); - break; case PROP_LAST_OPENED_SIZE: gui_config->last_opened_size = g_value_get_int (value); break; @@ -433,6 +430,7 @@ gimp_gui_config_set_property (GObject *object, break; case PROP_INFO_WINDOW_PER_DISPLAY: + case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: case PROP_SHOW_TIPS: /* ignored */ @@ -493,9 +491,6 @@ gimp_gui_config_get_property (GObject *object, case PROP_RESTORE_ACCELS: g_value_set_boolean (value, gui_config->restore_accels); break; - case PROP_MENU_MNEMONICS: - g_value_set_boolean (value, gui_config->menu_mnemonics); - break; case PROP_LAST_OPENED_SIZE: g_value_set_int (value, gui_config->last_opened_size); break; @@ -555,6 +550,7 @@ gimp_gui_config_get_property (GObject *object, break; case PROP_INFO_WINDOW_PER_DISPLAY: + case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: case PROP_SHOW_TIPS: /* ignored */ diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h index 68c99816d7..63e05a829e 100644 --- a/app/config/gimpguiconfig.h +++ b/app/config/gimpguiconfig.h @@ -52,7 +52,6 @@ struct _GimpGuiConfig gboolean can_change_accels; gboolean save_accels; gboolean restore_accels; - gboolean menu_mnemonics; gint last_opened_size; guint64 max_new_image_size; gboolean toolbox_color_area; diff --git a/app/core/gimpfilteredcontainer.c b/app/core/gimpfilteredcontainer.c index 703db03268..7e9747371a 100644 --- a/app/core/gimpfilteredcontainer.c +++ b/app/core/gimpfilteredcontainer.c @@ -213,8 +213,7 @@ gimp_filtered_container_set_property (GObject *object, switch (property_id) { case PROP_SRC_CONTAINER: - filtered_container->src_container = g_value_get_object (value); - g_object_ref (filtered_container->src_container); + filtered_container->src_container = g_value_dup_object (value); g_signal_connect (filtered_container->src_container, "add", G_CALLBACK (gimp_filtered_container_src_add), diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index e190b8d75b..2d68ce9338 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -146,7 +146,7 @@ about_dialog_create (GimpContext *context) dialog); /* kids, don't try this at home! */ - container = GTK_DIALOG (widget)->vbox; + container = gtk_dialog_get_content_area (GTK_DIALOG (widget)); children = gtk_container_get_children (GTK_CONTAINER (container)); if (GTK_IS_VBOX (children->data)) diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c index dd77a3ec87..7d80dc9c3d 100644 --- a/app/dialogs/channel-options-dialog.c +++ b/app/dialogs/channel-options-dialog.c @@ -124,7 +124,8 @@ channel_options_dialog_new (GimpImage *image, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + hbox); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 6); diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index a411c9234b..7b6cbb7863 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -158,7 +158,7 @@ convert_dialog_new (GimpImage *image, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox); gtk_widget_show (main_vbox); diff --git a/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c index e60d68da6c..4284909f31 100644 --- a/app/dialogs/fade-dialog.c +++ b/app/dialogs/fade-dialog.c @@ -141,7 +141,8 @@ fade_dialog_new (GimpImage *image, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); table = gtk_table_new (3, 3, FALSE); diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c index 38f88cdffd..b3e39d8b76 100644 --- a/app/dialogs/file-open-location-dialog.c +++ b/app/dialogs/file-open-location-dialog.c @@ -90,7 +90,7 @@ file_open_location_dialog_new (Gimp *gimp) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c index fc8d03c68c..de3483f89f 100644 --- a/app/dialogs/grid-dialog.c +++ b/app/dialogs/grid-dialog.c @@ -108,7 +108,7 @@ grid_dialog_new (GimpImage *image, editor = gimp_grid_editor_new (grid, context, xres, yres); gtk_container_set_border_width (GTK_CONTAINER (editor), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), editor); gtk_widget_show (editor); diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c index 4376effa05..60f088843d 100644 --- a/app/dialogs/image-merge-layers-dialog.c +++ b/app/dialogs/image-merge-layers-dialog.c @@ -85,7 +85,8 @@ image_merge_layers_dialog_new (GimpImage *image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), + vbox); gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Final, Merged Layer should be:"), diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index ba13c7732b..28ad571f9f 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -122,7 +122,7 @@ image_new_dialog_new (GimpContext *context) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c index d96f23796f..70832b4656 100644 --- a/app/dialogs/image-properties-dialog.c +++ b/app/dialogs/image-properties-dialog.c @@ -74,8 +74,8 @@ image_properties_dialog_new (GimpImage *image, NULL); notebook = gtk_notebook_new (); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + notebook, FALSE, FALSE, 0); gtk_widget_show (notebook); view = gimp_image_prop_view_new (image); diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c index 185351a2d8..a1193b5857 100644 --- a/app/dialogs/keyboard-shortcuts-dialog.c +++ b/app/dialogs/keyboard-shortcuts-dialog.c @@ -61,7 +61,8 @@ keyboard_shortcuts_dialog_new (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); editor = gimp_action_editor_new (gimp_ui_managers_from_name ("")->data, diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c index be0e16d39b..c5d8f99c17 100644 --- a/app/dialogs/layer-add-mask-dialog.c +++ b/app/dialogs/layer-add-mask-dialog.c @@ -102,7 +102,8 @@ layer_add_mask_dialog_new (GimpLayer *layer, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), + vbox); gtk_widget_show (vbox); frame = diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c index 9932cfcba1..2e0ba8d615 100644 --- a/app/dialogs/layer-options-dialog.c +++ b/app/dialogs/layer-options-dialog.c @@ -109,7 +109,7 @@ layer_options_dialog_new (GimpImage *image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), vbox); gtk_widget_show (vbox); diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index f44537302f..eba3377579 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -143,7 +143,8 @@ module_dialog_new (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + vbox); gtk_widget_show (vbox); dialog->hint = gimp_hint_box_new (_("You will have to restart GIMP " diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 1fd4ecb7dc..0be7e31efd 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -144,7 +144,7 @@ offset_dialog_new (GimpDrawable *drawable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox); gtk_widget_show (main_vbox); diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 2d71469d7b..602d9c6e66 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -189,7 +189,7 @@ palette_import_dialog_new (GimpContext *context) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_hbox); gtk_widget_show (main_hbox); diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index bb1c4bb95c..c2c146cf4b 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1437,7 +1437,8 @@ prefs_dialog_new (Gimp *gimp, /* The main hbox */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox); gtk_widget_show (hbox); /* The categories tree */ @@ -1632,9 +1633,6 @@ prefs_dialog_new (Gimp *gimp, vbox2 = prefs_frame_new (_("Keyboard Shortcuts"), GTK_CONTAINER (vbox), FALSE); - prefs_check_button_add (object, "menu-mnemonics", - _("Show menu _mnemonics (access keys)"), - GTK_BOX (vbox2)); prefs_check_button_add (object, "can-change-accels", _("_Use dynamic keyboard shortcuts"), GTK_BOX (vbox2)); diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c index f2aa1aac65..d8c72905f6 100644 --- a/app/dialogs/print-size-dialog.c +++ b/app/dialogs/print-size-dialog.c @@ -137,7 +137,7 @@ print_size_dialog_new (GimpImage *image, frame = gimp_frame_new (_("Print Size")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index f4880f23ec..a6a3be3c75 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -184,7 +184,8 @@ resize_dialog_new (GimpViewable *viewable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (text); diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c index fcae657938..6e4d4810bf 100644 --- a/app/dialogs/resolution-calibrate-dialog.c +++ b/app/dialogs/resolution-calibrate-dialog.c @@ -92,7 +92,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, table = gtk_table_new (4, 4, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table); gtk_widget_show (table); if (pixbuf) diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c index 9b3240b966..5f7fb897de 100644 --- a/app/dialogs/scale-dialog.c +++ b/app/dialogs/scale-dialog.c @@ -162,7 +162,8 @@ scale_dialog_new (GimpViewable *viewable, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); frame = gimp_frame_new (text); diff --git a/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c index 72a82af693..1a2f1b9266 100644 --- a/app/dialogs/stroke-dialog.c +++ b/app/dialogs/stroke-dialog.c @@ -123,7 +123,8 @@ stroke_dialog_new (GimpItem *item, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); radio_box = gimp_prop_enum_radio_box_new (G_OBJECT (options), "method", diff --git a/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c index 3c0b6af882..282f6f9d1f 100644 --- a/app/dialogs/template-options-dialog.c +++ b/app/dialogs/template-options-dialog.c @@ -103,7 +103,8 @@ template_options_dialog_new (GimpTemplate *template, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + vbox); gtk_widget_show (vbox); options->editor = gimp_template_editor_new (template, options->gimp, TRUE); diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index 6eb2a185ca..0bbb9045ad 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -156,7 +156,7 @@ tips_dialog_create (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tips_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tips_dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 28619ec60f..c59761e228 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -97,8 +97,8 @@ user_install_dialog_new (GimpUserInstall *install) frame = gimp_frame_new (_("Installation Log")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + frame, TRUE, TRUE, 0); gtk_widget_show (frame); scrolled = gtk_scrolled_window_new (NULL, NULL); diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c index b28c76d214..9beac8825e 100644 --- a/app/dialogs/vectors-options-dialog.c +++ b/app/dialogs/vectors-options-dialog.c @@ -101,7 +101,8 @@ vectors_options_dialog_new (GimpImage *image, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + hbox); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 6); diff --git a/app/display/gimpdisplay-foreach.c b/app/display/gimpdisplay-foreach.c index 549dd3c53b..1abbec4807 100644 --- a/app/display/gimpdisplay-foreach.c +++ b/app/display/gimpdisplay-foreach.c @@ -246,7 +246,8 @@ gimp_displays_get_num_visible (Gimp *gimp) if (GTK_WIDGET_DRAWABLE (display->shell)) { - GdkWindowState state = gdk_window_get_state (display->shell->window); + GdkWindow *window = gtk_widget_get_window (display->shell); + GdkWindowState state = gdk_window_get_state (window); if ((state & (GDK_WINDOW_STATE_WITHDRAWN | GDK_WINDOW_STATE_ICONIFIED)) == 0) diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 1e308392e3..4a697a65a7 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -456,7 +456,7 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell, gimp_display_shell_start_scrolling (shell, coords.x, coords.y); - gdk_pointer_grab (shell->canvas->window, FALSE, + gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, NULL, time); @@ -482,7 +482,7 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell, break; } - gdk_keyboard_grab (shell->canvas->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (shell->canvas), FALSE, time); shell->space_pressed = TRUE; } @@ -839,7 +839,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, /* we expect a FOCUS_IN event to follow, but can't rely * on it, so force one */ - gdk_window_focus (canvas->window, time); + gdk_window_focus (gtk_widget_get_window (canvas), time); } /* ignore new mouse events */ @@ -871,11 +871,11 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, } } - gdk_pointer_grab (canvas->window, + gdk_pointer_grab (gtk_widget_get_window (canvas), FALSE, event_mask, NULL, NULL, time); if (! shell->space_pressed && ! shell->space_release_pending) - gdk_keyboard_grab (canvas->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (canvas), FALSE, time); if (active_tool && (! gimp_image_is_empty (image) || @@ -1174,9 +1174,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, value = (gtk_adjustment_get_value (adj) + ((direction == GDK_SCROLL_UP || direction == GDK_SCROLL_LEFT) ? - -adj->page_increment / 2 : - adj->page_increment / 2)); - value = CLAMP (value, adj->lower, adj->upper - adj->page_size); + -gtk_adjustment_get_page_increment (adj) / 2 : + gtk_adjustment_get_page_increment (adj) / 2)); + value = CLAMP (value, + gtk_adjustment_get_lower (adj), + gtk_adjustment_get_upper (adj) - + gtk_adjustment_get_page_size (adj)); gtk_adjustment_set_value (adj, value); } @@ -1749,17 +1752,18 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget, /* we expect a FOCUS_IN event to follow, but can't rely * on it, so force one */ - gdk_window_focus (shell->canvas->window, + gdk_window_focus (gtk_widget_get_window (shell->canvas), gdk_event_get_time ((GdkEvent *) event)); } - gdk_pointer_grab (shell->canvas->window, FALSE, + gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, NULL, event->time); - gdk_keyboard_grab (shell->canvas->window, FALSE, event->time); + gdk_keyboard_grab (gtk_widget_get_window (shell->canvas), + FALSE, event->time); if (sample_point) gimp_color_tool_start_sample_point (active_tool, display); @@ -1834,11 +1838,11 @@ void gimp_display_shell_quick_mask_toggled (GtkWidget *widget, GimpDisplayShell *shell) { - if (GTK_TOGGLE_BUTTON (widget)->active != - gimp_image_get_quick_mask_state (shell->display->image)) + gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + + if (active != gimp_image_get_quick_mask_state (shell->display->image)) { - gimp_image_set_quick_mask_state (shell->display->image, - GTK_TOGGLE_BUTTON (widget)->active); + gimp_image_set_quick_mask_state (shell->display->image, active); gimp_image_flush (shell->display->image); } @@ -2175,7 +2179,7 @@ gimp_display_shell_canvas_expose_drop_zone (GimpDisplayShell *shell, { cairo_t *cr; - cr = gdk_cairo_create (shell->canvas->window); + cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas)); gdk_cairo_region (cr, eevent->region); cairo_clip (cr); diff --git a/app/display/gimpdisplayshell-coords.c b/app/display/gimpdisplayshell-coords.c index 9b4e787f97..ae3051497d 100644 --- a/app/display/gimpdisplayshell-coords.c +++ b/app/display/gimpdisplayshell-coords.c @@ -92,7 +92,8 @@ gimp_display_shell_get_device_coords (GimpDisplayShell *shell, { gdouble axes[GDK_AXIS_LAST]; - gdk_device_get_state (device, shell->canvas->window, axes, NULL); + gdk_device_get_state (device, gtk_widget_get_window (shell->canvas), + axes, NULL); gdk_device_get_axis (device, axes, GDK_AXIS_X, &coords->x); gdk_device_get_axis (device, axes, GDK_AXIS_Y, &coords->y); @@ -186,7 +187,8 @@ gimp_display_shell_get_device_state (GimpDisplayShell *shell, GdkDevice *device, GdkModifierType *state) { - gdk_device_get_state (device, shell->canvas->window, NULL, state); + gdk_device_get_state (device, gtk_widget_get_window (shell->canvas), + NULL, state); } /** diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c index 9cf94a5e34..9aa7acb3d0 100644 --- a/app/display/gimpdisplayshell-cursor.c +++ b/app/display/gimpdisplayshell-cursor.c @@ -231,7 +231,7 @@ gimp_display_shell_real_set_cursor (GimpDisplayShell *shell, shell->current_cursor = cursor_type; if (GTK_WIDGET_DRAWABLE (shell->canvas)) - gdk_window_set_cursor (shell->canvas->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window (shell->canvas), NULL); return; } diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 14814958fb..5c95aa01b0 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -146,7 +146,7 @@ gimp_display_shell_draw_guide (const GimpDisplayShell *shell, x1 = 0; y1 = 0; - gdk_drawable_get_size (shell->canvas->window, &x2, &y2); + gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &x2, &y2); switch (gimp_guide_get_orientation (guide)) { @@ -429,7 +429,7 @@ gimp_display_shell_draw_sample_point (const GimpDisplayShell *shell, y1 = floor (y - GIMP_SAMPLE_POINT_DRAW_SIZE); y2 = ceil (y + GIMP_SAMPLE_POINT_DRAW_SIZE); - gdk_drawable_get_size (shell->canvas->window, &w, &h); + gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &w, &h); if (x < - GIMP_SAMPLE_POINT_DRAW_SIZE || y < - GIMP_SAMPLE_POINT_DRAW_SIZE || @@ -663,7 +663,7 @@ gimp_display_shell_get_grid_gc (GimpDisplayShell *shell, values.join_style = GDK_JOIN_MITER; - shell->grid_gc = gdk_gc_new_with_values (shell->canvas->window, + shell->grid_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas), &values, (GDK_GC_LINE_STYLE | GDK_GC_JOIN_STYLE)); @@ -692,7 +692,7 @@ gimp_display_shell_get_pen_gc (GimpDisplayShell *shell, values.cap_style = GDK_CAP_ROUND; values.join_style = GDK_JOIN_ROUND; - shell->pen_gc = gdk_gc_new_with_values (shell->canvas->window, + shell->pen_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas), &values, (GDK_GC_LINE_STYLE | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE)); diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 41753261ef..58a39b07c6 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -116,7 +116,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell) editor = gimp_color_display_editor_new (shell->filter_stack); gtk_container_set_border_width (GTK_CONTAINER (editor), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cdd->dialog)->vbox), editor); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cdd->dialog))), + editor); gtk_widget_show (editor); return cdd->dialog; diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c index e6ec0e0b01..faeae5d916 100644 --- a/app/display/gimpdisplayshell-layer-select.c +++ b/app/display/gimpdisplayshell-layer-select.c @@ -93,7 +93,7 @@ gimp_display_shell_layer_select_init (GimpDisplayShell *shell, gtk_widget_show (layer_select->shell); - gdk_keyboard_grab (layer_select->shell->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (layer_select->shell), FALSE, time); } diff --git a/app/display/gimpdisplayshell-preview.c b/app/display/gimpdisplayshell-preview.c index 2c7aaf53ab..68163deda9 100644 --- a/app/display/gimpdisplayshell-preview.c +++ b/app/display/gimpdisplayshell-preview.c @@ -318,10 +318,10 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell) k = columns * rows; for (j = 0; j < k; j++) gimp_display_shell_draw_quad (tool->drawable, - GDK_DRAWABLE (GTK_WIDGET (shell->canvas)->window), - mask, mask_offx, mask_offy, - x[j], y[j], u[j], v[j], - opacity); + GDK_DRAWABLE (gtk_widget_get_window (shell->canvas)), + mask, mask_offx, mask_offy, + x[j], y[j], u[j], v[j], + opacity); } diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c index 62b1fce212..8b311fd6e8 100644 --- a/app/display/gimpdisplayshell-progress.c +++ b/app/display/gimpdisplayshell-progress.c @@ -51,7 +51,8 @@ gimp_display_shell_progress_start (GimpProgress *progress, if (progress && gimp_display_shell_is_iconified (shell)) { - gdk_window_set_title (GTK_WIDGET (shell)->window, message); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + message); } return progress; @@ -87,7 +88,8 @@ gimp_display_shell_progress_set_text (GimpProgress *progress, if (gimp_progress_is_active (GIMP_PROGRESS (shell->statusbar)) && gimp_display_shell_is_iconified (shell)) { - gdk_window_set_title (GTK_WIDGET (shell)->window, message); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + message); } } @@ -165,7 +167,8 @@ gimp_display_shell_is_iconified (GimpDisplayShell *shell) GtkWidget *widget = GTK_WIDGET (shell); return (GTK_WIDGET_DRAWABLE (widget) && - gdk_window_get_state (widget->window) == GDK_WINDOW_STATE_ICONIFIED); + gdk_window_get_state (gtk_widget_get_window (widget)) == + GDK_WINDOW_STATE_ICONIFIED); } @@ -195,7 +198,8 @@ gimp_display_shell_progress_window_state_changed (GimpDisplayShell *shell) "progress"); if (msg) { - gdk_window_set_title (GTK_WIDGET (shell)->window, msg); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + msg); return; } } diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c index 59a1c99324..9a9f255741 100644 --- a/app/display/gimpdisplayshell-scale-dialog.c +++ b/app/display/gimpdisplayshell-scale-dialog.c @@ -147,7 +147,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell->scale_dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell->scale_dialog))), table); gtk_widget_show (table); diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c index ec6d3533bd..eabf786baf 100644 --- a/app/display/gimpdisplayshell-title.c +++ b/app/display/gimpdisplayshell-title.c @@ -107,7 +107,8 @@ gimp_display_shell_update_title_idle (gpointer data) g_strlcpy (title + len, GIMP_ACRONYM, sizeof (title) - len); - gdk_window_set_title (GTK_WIDGET (shell)->window, title); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + title); /* format the statusbar */ gimp_display_shell_format_title (shell, title, sizeof (title), @@ -118,7 +119,8 @@ gimp_display_shell_update_title_idle (gpointer data) } else { - gdk_window_set_title (GTK_WIDGET (shell)->window, GIMP_NAME); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + GIMP_NAME); gimp_statusbar_replace (GIMP_STATUSBAR (shell->statusbar), "title", NULL, " "); diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c index fa6eb715e3..af5966dc61 100644 --- a/app/display/gimpnavigationeditor.c +++ b/app/display/gimpnavigationeditor.c @@ -277,7 +277,8 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell, gint border_width, border_height; gint screen_click_x, screen_click_y; - gdk_window_get_origin (widget->window, &x_origin, &y_origin); + gdk_window_get_origin (gtk_widget_get_window (widget), + &x_origin, &y_origin); screen_click_x = x_origin + click_x; screen_click_y = y_origin + click_y; diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index 42d55b942b..7c860f3214 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -368,7 +368,7 @@ gimp_statusbar_progress_start (GimpProgress *progress, } if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); return progress; } @@ -426,7 +426,7 @@ gimp_statusbar_progress_set_text (GimpProgress *progress, gimp_statusbar_replace (statusbar, "progress", NULL, "%s", message); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } @@ -450,7 +450,7 @@ gimp_statusbar_progress_set_value (GimpProgress *progress, gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } } @@ -480,7 +480,7 @@ gimp_statusbar_progress_pulse (GimpProgress *progress) gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar)); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } @@ -1269,7 +1269,8 @@ gimp_statusbar_label_expose (GtkWidget *widget, PANGO_PIXELS (rect.width) : 0); y += PANGO_PIXELS (rect.y); - gdk_draw_pixbuf (widget->window, gtk_widget_get_style (widget)->black_gc, + gdk_draw_pixbuf (gtk_widget_get_window (widget), + gtk_widget_get_style (widget)->black_gc, statusbar->icon, 0, 0, x, y, diff --git a/app/gegl/gimpoperationlevels.c b/app/gegl/gimpoperationlevels.c index 01cc7b112e..d7a706a255 100644 --- a/app/gegl/gimpoperationlevels.c +++ b/app/gegl/gimpoperationlevels.c @@ -89,12 +89,12 @@ gimp_operation_levels_map (gdouble value, else value = (value - low_input); + /* clamp to new black and white points */ + value = CLAMP (value, 0.0, 1.0); + if (inv_gamma != 1.0) { - if (value >= 0.0) - value = pow ( value, inv_gamma); - else - value = -pow (-value, inv_gamma); + value = pow ( value, inv_gamma); } /* determine the output intensity */ diff --git a/app/gui/gui.c b/app/gui/gui.c index d7addf44f3..5a3971e5ac 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -171,7 +171,8 @@ gui_abort (const gchar *abort_message) gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + box); gtk_widget_show (box); gimp_dialog_run (GIMP_DIALOG (dialog)); diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 302260cdfe..5166ef97db 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -334,8 +334,8 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool) hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (picker_tool->dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (picker_tool->dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); picker_tool->color_frame1 = gimp_color_frame_new (); diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c index 9ac0f7dd5f..cfcb9ce3b7 100644 --- a/app/tools/gimpimagemaptool.c +++ b/app/tools/gimpimagemaptool.c @@ -304,7 +304,8 @@ gimp_image_map_tool_initialize (GimpTool *tool, image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + vbox); if (klass->settings_name) gimp_image_map_tool_add_settings_gui (image_map_tool); diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 4ee2c1d010..67edcdb218 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -1006,7 +1006,8 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table); gtk_widget_show (table); diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index f1b1cfddc5..630a967c94 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -114,8 +114,8 @@ gimp_perspective_tool_dialog (GimpTransformTool *tr_tool) frame = gimp_frame_new (_("Transformation Matrix")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), frame, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + frame, FALSE, FALSE, 0); gtk_widget_show (frame); table = gtk_table_new (3, 3, FALSE); diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index 50a47635a8..8677203f0a 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -177,8 +177,8 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool) gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); button = gimp_spin_button_new (&rotate->angle_adj, diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index 03563bc5b4..5bef6d94d1 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -170,8 +170,8 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool, NULL); gtk_container_set_border_width (GTK_CONTAINER (scale->box), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), scale->box, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + scale->box, FALSE, FALSE, 0); gtk_widget_show (scale->box); g_signal_connect (scale->box, "notify", diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 3239320392..082ae82e82 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -123,8 +123,8 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool) gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); button = gimp_spin_button_new (&shear->x_adj, diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index c59103d874..dbfcc3822d 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -2376,7 +2376,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool) vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); diff --git a/app/widgets/gimpactionfactory.c b/app/widgets/gimpactionfactory.c index 0850ef4f46..755545635b 100644 --- a/app/widgets/gimpactionfactory.c +++ b/app/widgets/gimpactionfactory.c @@ -81,8 +81,7 @@ gimp_action_factory_finalize (GObject *object) } GimpActionFactory * -gimp_action_factory_new (Gimp *gimp, - gboolean mnemonics) +gimp_action_factory_new (Gimp *gimp) { GimpActionFactory *factory; @@ -90,8 +89,7 @@ gimp_action_factory_new (Gimp *gimp, factory = g_object_new (GIMP_TYPE_ACTION_FACTORY, NULL); - factory->gimp = gimp; - factory->mnemonics = mnemonics ? TRUE : FALSE; + factory->gimp = gimp; return factory; } @@ -146,7 +144,6 @@ gimp_action_factory_group_new (GimpActionFactory *factory, entry->identifier, entry->label, entry->stock_id, - factory->mnemonics, user_data, entry->update_func); diff --git a/app/widgets/gimpactionfactory.h b/app/widgets/gimpactionfactory.h index 1bff478d86..9f0e610d2d 100644 --- a/app/widgets/gimpactionfactory.h +++ b/app/widgets/gimpactionfactory.h @@ -53,8 +53,6 @@ struct _GimpActionFactory Gimp *gimp; GList *registered_groups; - - gboolean mnemonics; }; struct _GimpActionFactoryClass @@ -65,8 +63,7 @@ struct _GimpActionFactoryClass GType gimp_action_factory_get_type (void) G_GNUC_CONST; -GimpActionFactory * gimp_action_factory_new (Gimp *gimp, - gboolean mnemonics); +GimpActionFactory * gimp_action_factory_new (Gimp *gimp); void gimp_action_factory_group_register (GimpActionFactory *factory, const gchar *identifier, diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c index 7e6c70d6c7..34252561b3 100644 --- a/app/widgets/gimpactiongroup.c +++ b/app/widgets/gimpactiongroup.c @@ -46,8 +46,7 @@ enum PROP_0, PROP_GIMP, PROP_LABEL, - PROP_STOCK_ID, - PROP_MNEMONICS + PROP_STOCK_ID }; @@ -103,13 +102,6 @@ gimp_action_group_class_init (GimpActionGroupClass *klass) GIMP_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (object_class, PROP_MNEMONICS, - g_param_spec_boolean ("mnemonics", - NULL, NULL, - TRUE, - GIMP_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); - klass->groups = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); } @@ -223,9 +215,7 @@ gimp_action_group_set_property (GObject *object, case PROP_STOCK_ID: group->stock_id = g_value_dup_string (value); break; - case PROP_MNEMONICS: - group->mnemonics = g_value_get_boolean (value); - break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -251,9 +241,7 @@ gimp_action_group_get_property (GObject *object, case PROP_STOCK_ID: g_value_set_string (value, group->stock_id); break; - case PROP_MNEMONICS: - g_value_set_boolean (value, group->mnemonics); - break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -283,7 +271,6 @@ gimp_action_group_check_unique_action (GimpActionGroup *group, * @name: the name of the action group. * @label: the user visible label of the action group. * @stock_id: the icon of the action group. - * @mnemonics: whether or not to show mnemonics. * @user_data: the user_data for #GtkAction callbacks. * @update_func: the function that will be called on * gimp_action_group_update(). @@ -299,7 +286,6 @@ gimp_action_group_new (Gimp *gimp, const gchar *name, const gchar *label, const gchar *stock_id, - gboolean mnemonics, gpointer user_data, GimpActionGroupUpdateFunc update_func) { @@ -313,7 +299,6 @@ gimp_action_group_new (Gimp *gimp, "name", name, "label", label, "stock-id", stock_id, - "mnemonics", mnemonics, NULL); group->user_data = user_data; @@ -362,7 +347,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -370,7 +355,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -381,15 +366,9 @@ gimp_action_group_add_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_action_new (entries[i].name, label, tooltip, entries[i].stock_id); - if (! group->mnemonics) - g_free (label); - if (entries[i].callback) g_signal_connect (action, "activate", entries[i].callback, @@ -421,7 +400,7 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GtkToggleAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -429,7 +408,7 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -440,15 +419,9 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_toggle_action_new (entries[i].name, label, tooltip, entries[i].stock_id); - if (! group->mnemonics) - g_free (label); - gtk_toggle_action_set_active (action, entries[i].is_active); if (entries[i].callback) @@ -486,7 +459,7 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GtkRadioAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -494,7 +467,7 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -505,16 +478,10 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_radio_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value); - if (! group->mnemonics) - g_free (label); - if (i == 0) first_action = action; @@ -558,7 +525,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpEnumAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -566,7 +533,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -577,17 +544,11 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_enum_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value, entries[i].value_variable); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -620,7 +581,7 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpStringAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -628,7 +589,7 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -639,16 +600,10 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_string_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -680,25 +635,16 @@ gimp_action_group_add_plug_in_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpPlugInAction *action; - gchar *label; if (! gimp_action_group_check_unique_action (group, entries[i].name)) continue; - label = (gchar *) entries[i].label; - - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_plug_in_action_new (entries[i].name, - label, + entries[i].label, entries[i].tooltip, entries[i].stock_id, entries[i].procedure); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -822,7 +768,6 @@ gimp_action_group_set_action_label (GimpActionGroup *group, const gchar *label) { GtkAction *action; - gchar *stripped; g_return_if_fail (GIMP_IS_ACTION_GROUP (group)); g_return_if_fail (action_name != NULL); @@ -837,15 +782,7 @@ gimp_action_group_set_action_label (GimpActionGroup *group, return; } - if (! group->mnemonics) - stripped = gimp_strip_uline (label); - else - stripped = (gchar *) label; - - gtk_action_set_label (action, stripped); - - if (! group->mnemonics) - g_free (stripped); + gtk_action_set_label (action, label); } void diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h index e604225924..4578bc5008 100644 --- a/app/widgets/gimpactiongroup.h +++ b/app/widgets/gimpactiongroup.h @@ -39,7 +39,6 @@ struct _GimpActionGroup Gimp *gimp; gchar *label; gchar *stock_id; - gboolean mnemonics; gpointer user_data; @@ -134,7 +133,6 @@ GimpActionGroup *gimp_action_group_new (Gimp *gimp, const gchar *name, const gchar *label, const gchar *stock_id, - gboolean mnemonics, gpointer user_data, GimpActionGroupUpdateFunc update_func); diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c index c0c3385872..89abfc52ed 100644 --- a/app/widgets/gimpchanneltreeview.c +++ b/app/widgets/gimpchanneltreeview.c @@ -36,12 +36,14 @@ #include "core/gimplayer.h" #include "core/gimplayermask.h" +#include "gimpactiongroup.h" #include "gimpchanneltreeview.h" #include "gimpcomponenteditor.h" #include "gimpcontainerview.h" #include "gimpdnd.h" #include "gimpdocked.h" #include "gimphelp-ids.h" +#include "gimpuimanager.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -77,6 +79,11 @@ static void gimp_channel_tree_view_set_context (GimpContainerView *view, GimpContext *context); static void gimp_channel_tree_view_set_view_size (GimpContainerView *view); +static void gimp_channel_tree_view_channel_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view); + G_DEFINE_TYPE_WITH_CODE (GimpChannelTreeView, gimp_channel_tree_view, GIMP_TYPE_DRAWABLE_TREE_VIEW, @@ -165,6 +172,10 @@ gimp_channel_tree_view_constructor (GType type, view = GIMP_CHANNEL_TREE_VIEW (object); tree_view = GIMP_CONTAINER_TREE_VIEW (object); + g_signal_connect (tree_view->renderer_cell, "clicked", + G_CALLBACK (gimp_channel_tree_view_channel_clicked), + view); + gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER, NULL, tree_view); gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER_MASK, @@ -374,3 +385,38 @@ gimp_channel_tree_view_set_view_size (GimpContainerView *view) gimp_component_editor_set_view_size (GIMP_COMPONENT_EDITOR (channel_view->priv->component_editor), view_size); } + + +/* signal handlers */ + +static void +gimp_channel_tree_view_channel_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view) +{ + if (state & GDK_MOD1_MASK) + { + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; + const gchar *action = "channels-selection-replace"; + + group = gimp_ui_manager_get_action_group (ui_manager, "channels"); + + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "channels-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "channels-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "channels-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } +} + diff --git a/app/widgets/gimpimagecommenteditor.c b/app/widgets/gimpimagecommenteditor.c index 5c3cde20a8..6cb00a03c5 100644 --- a/app/widgets/gimpimagecommenteditor.c +++ b/app/widgets/gimpimagecommenteditor.c @@ -30,18 +30,25 @@ #include "widgets-types.h" +#include "config/gimpcoreconfig.h" + +#include "core/gimp.h" #include "core/gimpimage.h" +#include "core/gimptemplate.h" #include "gimpimagecommenteditor.h" +#include "gimp-intl.h" #define GIMP_IMAGE_COMMENT_PARASITE "gimp-comment" -static void gimp_image_comment_editor_update (GimpImageParasiteView *view); +static void gimp_image_comment_editor_update (GimpImageParasiteView *view); -static void gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, - GimpImageCommentEditor *editor); +static void gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, + GimpImageCommentEditor *editor); +static void gimp_image_comment_editor_use_default_comment (GtkWidget *button, + GimpImageCommentEditor *editor); G_DEFINE_TYPE (GimpImageCommentEditor, @@ -60,20 +67,30 @@ gimp_image_comment_editor_class_init (GimpImageCommentEditorClass *klass) static void gimp_image_comment_editor_init (GimpImageCommentEditor *editor) { + GtkWidget *vbox; GtkWidget *scrolled_window; GtkWidget *text_view; + GtkWidget *button; + /* Init */ editor->recoursing = FALSE; + /* Vbox */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (editor), vbox); + gtk_widget_show (vbox); + + /* Scrolled winow */ scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 2); - gtk_container_add (GTK_CONTAINER (editor), scrolled_window); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0); gtk_widget_show (scrolled_window); + /* Text view */ text_view = gtk_text_view_new (); gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), TRUE); @@ -86,6 +103,21 @@ gimp_image_comment_editor_init (GimpImageCommentEditor *editor) gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); gtk_widget_show (text_view); + /* Button */ + button = gtk_button_new_with_label (_("Use default comment")); + gimp_help_set_help_data (GTK_WIDGET (button), + _("Replace the current image comment with the " + "default comment set in " + "Edit→Preferences→Default Image."), + NULL); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); + gtk_widget_show (button); + + g_signal_connect (button, "clicked", + G_CALLBACK (gimp_image_comment_editor_use_default_comment), + editor); + + /* Buffer */ editor->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); g_signal_connect (editor->buffer, "changed", @@ -192,3 +224,16 @@ gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, g_free (text); } + +static void +gimp_image_comment_editor_use_default_comment (GtkWidget *button, + GimpImageCommentEditor *editor) +{ + GimpImage *image = gimp_image_parasite_view_get_image (GIMP_IMAGE_PARASITE_VIEW (editor)); + const gchar *comment = image ? image->gimp->config->default_image->comment : NULL; + + if (comment) + gtk_text_buffer_set_text (editor->buffer, comment, -1); + else + gtk_text_buffer_set_text (editor->buffer, "", -1); +} diff --git a/app/widgets/gimplanguageentry.c b/app/widgets/gimplanguageentry.c index 4234e23179..a534703bba 100644 --- a/app/widgets/gimplanguageentry.c +++ b/app/widgets/gimplanguageentry.c @@ -94,10 +94,15 @@ gimp_language_entry_constructor (GType type, completion = g_object_new (GTK_TYPE_ENTRY_COMPLETION, "model", entry->store, - "text-column", GIMP_LANGUAGE_STORE_LANGUAGE, "inline-selection", TRUE, NULL); + /* Note that we must use this function to set the text column, + * otherwise we won't get a cell renderer for free + */ + gtk_entry_completion_set_text_column (completion, + GIMP_LANGUAGE_STORE_LANGUAGE); + gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_object_unref (completion); } diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 451d740d0e..ac21a5324f 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -1319,25 +1319,48 @@ gimp_layer_tree_view_layer_clicked (GimpCellRendererViewable *cell, if (gtk_tree_model_get_iter (tree_view->model, &iter, path)) { - GimpViewRenderer *renderer; - GimpUIManager *ui_manager; - GimpActionGroup *group; + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; - ui_manager = GIMP_EDITOR (tree_view)->ui_manager; - group = gimp_ui_manager_get_action_group (ui_manager, "layers"); + group = gimp_ui_manager_get_action_group (ui_manager, "layers"); - gtk_tree_model_get (tree_view->model, &iter, - layer_view->priv->model_column_mask, &renderer, - -1); - - if (renderer) + if (state & GDK_MOD1_MASK) { - GimpLayerMask *mask = GIMP_LAYER_MASK (renderer->viewable); + const gchar *action = "layers-alpha-selection-replace"; - if (gimp_layer_mask_get_edit (mask)) - gimp_action_group_set_action_active (group, - "layers-mask-edit", FALSE); - g_object_unref (renderer); + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "layers-alpha-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "layers-alpha-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "layers-alpha-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } + else + { + GimpViewRenderer *renderer; + + gtk_tree_model_get (tree_view->model, &iter, + layer_view->priv->model_column_mask, &renderer, + -1); + + if (renderer) + { + GimpLayerMask *mask = GIMP_LAYER_MASK (renderer->viewable); + + if (gimp_layer_mask_get_edit (mask)) + gimp_action_group_set_action_active (group, + "layers-mask-edit", FALSE); + + g_object_unref (renderer); + } } } diff --git a/app/widgets/gimptagentry.c b/app/widgets/gimptagentry.c index d37902c869..6d11728ea4 100644 --- a/app/widgets/gimptagentry.c +++ b/app/widgets/gimptagentry.c @@ -1206,7 +1206,7 @@ gimp_tag_entry_expose (GtkWidget *widget, const char *display_text; /* eeeeeek */ - if (widget->window == event->window) + if (gtk_widget_get_window (widget) == event->window) return FALSE; if (! GIMP_TAG_ENTRY (widget)->description_shown) @@ -1236,7 +1236,7 @@ gimp_tag_entry_expose (GtkWidget *widget, &layout_width, &layout_height); offset = (window_height - PANGO_PIXELS (layout_height)) / 2; - gtk_paint_layout (widget->style, + gtk_paint_layout (gtk_widget_get_style (widget), event->window, GTK_STATE_INSENSITIVE, TRUE, diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index f26032df74..26a24e877f 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -92,6 +92,9 @@ static gboolean gimp_tag_popup_list_event (GtkWidget *widg static gboolean gimp_tag_popup_is_in_tag (PopupTagData *tag_data, gint x, gint y); + +static void gimp_tag_popup_queue_draw_tag (GimpTagPopup *widget, + PopupTagData *tag_data); static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data); static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged, @@ -177,6 +180,20 @@ gimp_tag_popup_init (GimpTagPopup *popup) GDK_POINTER_MOTION_MASK); gtk_container_add (GTK_CONTAINER (popup->alignment), popup->tag_area); gtk_widget_show (popup->tag_area); + + g_signal_connect (popup->alignment, "expose-event", + G_CALLBACK (gimp_tag_popup_border_expose), + popup); + g_signal_connect (popup, "event", + G_CALLBACK (gimp_tag_popup_border_event), + NULL); + g_signal_connect (popup->tag_area, "expose-event", + G_CALLBACK (gimp_tag_popup_list_expose), + popup); + g_signal_connect (popup->tag_area, "event", + G_CALLBACK (gimp_tag_popup_list_event), + popup); + } static GObject * @@ -348,19 +365,6 @@ gimp_tag_popup_constructor (GType type, gtk_window_move (GTK_WINDOW (popup), popup_rect.x, popup_rect.y); gtk_window_resize (GTK_WINDOW (popup), popup_rect.width, popup_rect.height); - g_signal_connect (popup->alignment, "expose-event", - G_CALLBACK (gimp_tag_popup_border_expose), - popup); - g_signal_connect (popup, "event", - G_CALLBACK (gimp_tag_popup_border_event), - NULL); - g_signal_connect (popup->tag_area, "expose-event", - G_CALLBACK (gimp_tag_popup_list_expose), - popup); - g_signal_connect (popup->tag_area, "event", - G_CALLBACK (gimp_tag_popup_list_event), - popup); - return object; } @@ -409,8 +413,8 @@ gimp_tag_popup_set_property (GObject *object, switch (property_id) { case PROP_OWNER: - popup->combo_entry = g_value_get_object (value); - g_object_ref (popup->combo_entry); + + popup->combo_entry = g_value_dup_object (value); break; default: @@ -567,21 +571,23 @@ gimp_tag_popup_border_expose (GtkWidget *widget, GdkEventExpose *event, GimpTagPopup *popup) { - GdkRectangle border; - GdkRectangle upper; - GdkRectangle lower; - gint arrow_space; - gint arrow_size; - if (event->window != widget->window) + GdkWindow *window = gtk_widget_get_window (widget); + GtkStyle *style = gtk_widget_get_style (widget); + GdkRectangle border; + GdkRectangle upper; + GdkRectangle lower; + gint arrow_space; + gint arrow_size; + + if (event->window != gtk_widget_get_window (widget)) return FALSE; get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space); arrow_size = 0.7 * arrow_space; - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -591,8 +597,7 @@ gimp_tag_popup_border_expose (GtkWidget *widget, { /* upper arrow */ - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -601,21 +606,19 @@ gimp_tag_popup_border_expose (GtkWidget *widget, upper.width, upper.height); - gtk_paint_arrow (widget->style, - widget->window, + gtk_paint_arrow (style, window, popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu_scroll_arrow_up", GTK_ARROW_UP, TRUE, upper.x + (upper.width - arrow_size) / 2, - upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + upper.y + style->ythickness + (arrow_space - arrow_size) / 2, arrow_size, arrow_size); /* lower arrow */ - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, popup->lower_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -624,15 +627,14 @@ gimp_tag_popup_border_expose (GtkWidget *widget, lower.width, lower.height); - gtk_paint_arrow (widget->style, - widget->window, + gtk_paint_arrow (style, window, popup->lower_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu_scroll_arrow_down", GTK_ARROW_DOWN, TRUE, lower.x + (lower.width - arrow_size) / 2, - lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + lower.y + style->ythickness + (arrow_space - arrow_size) / 2, arrow_size, arrow_size); } @@ -651,15 +653,15 @@ gimp_tag_popup_border_event (GtkWidget *widget, gint x; gint y; - if (button_event->window == widget->window && + if (button_event->window == gtk_widget_get_window (widget) && gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; } - gdk_window_get_pointer (widget->window, &x, &y, NULL); + gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL); - if (button_event->window != popup->tag_area->window && + if (button_event->window != gtk_widget_get_window (popup->tag_area) && (x < widget->allocation.y || y < widget->allocation.x || x > widget->allocation.x + widget->allocation.width || @@ -678,14 +680,13 @@ gimp_tag_popup_border_event (GtkWidget *widget, { GdkEventMotion *motion_event = (GdkEventMotion *) event; - if (motion_event->window == widget->window) - { - gint x = motion_event->x + widget->allocation.x; - gint y = motion_event->y + widget->allocation.y; + gint x, y; - gimp_tag_popup_handle_scrolling (popup, x, y, - popup->scroll_timeout_id == 0, TRUE); - } + gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL); + + gimp_tag_popup_handle_scrolling (popup, x, y, + motion_event->window == widget->window, + TRUE); } else if (event->type == GDK_BUTTON_RELEASE) { @@ -693,7 +694,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, popup->single_select_disabled = TRUE; - if (button_event->window == widget->window && + if (button_event->window == gtk_widget_get_window (widget) && gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; @@ -880,6 +881,9 @@ gimp_tag_popup_list_event (GtkWidget *widget, else if (event->type == GDK_MOTION_NOTIFY) { GdkEventMotion *motion_event = (GdkEventMotion *) event; + + PopupTagData *prelight = NULL; + gint x; gint y; gint i; @@ -893,15 +897,21 @@ gimp_tag_popup_list_event (GtkWidget *widget, if (gimp_tag_popup_is_in_tag (tag_data, x, y)) { - if (popup->prelight != tag_data) - { - popup->prelight = tag_data; - gtk_widget_queue_draw (widget); - } - + prelight = tag_data; break; } } + + if (prelight != popup->prelight) + { + if (popup->prelight) + gimp_tag_popup_queue_draw_tag (popup, popup->prelight); + + popup->prelight = prelight; + + if (popup->prelight) + gimp_tag_popup_queue_draw_tag (popup, popup->prelight); + } } else if (event->type == GDK_BUTTON_RELEASE && ! popup->single_select_disabled) @@ -948,6 +958,17 @@ gimp_tag_popup_is_in_tag (PopupTagData *tag_data, return FALSE; } +static void +gimp_tag_popup_queue_draw_tag (GimpTagPopup *popup, + PopupTagData *tag_data) +{ + gtk_widget_queue_draw_area (popup->tag_area, + tag_data->bounds.x, + tag_data->bounds.y - popup->scroll_y, + tag_data->bounds.width, + tag_data->bounds.height); +} + static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data) @@ -1180,6 +1201,7 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, { arrow_state = (popup->upper_arrow_prelight ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); + } if (arrow_state != popup->upper_arrow_state) @@ -1215,7 +1237,7 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, { popup->scroll_y = new_scroll_y; - gdk_window_scroll (popup->tag_area->window, 0, -step); + gdk_window_scroll (gtk_widget_get_window (popup->tag_area), 0, -step); } } @@ -1330,7 +1352,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { popup->upper_arrow_state = arrow_state; - gdk_window_invalidate_rect (GTK_WIDGET (popup)->window, + gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)), &rect, FALSE); } } @@ -1431,7 +1453,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { popup->lower_arrow_state = arrow_state; - gdk_window_invalidate_rect (GTK_WIDGET (popup)->window, + gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)), &rect, FALSE); } } diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c index ce933bba92..b240a6e749 100644 --- a/app/widgets/gimpvectorstreeview.c +++ b/app/widgets/gimpvectorstreeview.c @@ -38,9 +38,11 @@ #include "vectors/gimpvectors-export.h" #include "vectors/gimpvectors-import.h" +#include "gimpactiongroup.h" #include "gimpcontainerview.h" -#include "gimpvectorstreeview.h" #include "gimpdnd.h" +#include "gimpuimanager.h" +#include "gimpvectorstreeview.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -48,20 +50,24 @@ static void gimp_vectors_tree_view_view_iface_init (GimpContainerViewInterface *iface); -static GObject * gimp_vectors_tree_view_constructor (GType type, - guint n_params, - GObjectConstructParam *params); -static void gimp_vectors_tree_view_set_container (GimpContainerView *view, - GimpContainer *container); -static void gimp_vectors_tree_view_drop_svg (GimpContainerTreeView *tree_view, - const gchar *svg_data, - gsize svg_data_len, - GimpViewable *dest_viewable, - GtkTreeViewDropPosition drop_pos); -static GimpItem * gimp_vectors_tree_view_item_new (GimpImage *image); -static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, - gsize *svg_data_len, - gpointer data); +static GObject * gimp_vectors_tree_view_constructor (GType type, + guint n_params, + GObjectConstructParam *params); +static void gimp_vectors_tree_view_set_container (GimpContainerView *view, + GimpContainer *container); +static void gimp_vectors_tree_view_drop_svg (GimpContainerTreeView *tree_view, + const gchar *svg_data, + gsize svg_data_len, + GimpViewable *dest_viewable, + GtkTreeViewDropPosition drop_pos); +static GimpItem * gimp_vectors_tree_view_item_new (GimpImage *image); +static void gimp_vectors_tree_view_vectors_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view); +static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, + gsize *svg_data_len, + gpointer data); G_DEFINE_TYPE_WITH_CODE (GimpVectorsTreeView, gimp_vectors_tree_view, @@ -139,6 +145,10 @@ gimp_vectors_tree_view_constructor (GType type, tree_view = GIMP_CONTAINER_TREE_VIEW (object); view = GIMP_VECTORS_TREE_VIEW (object); + g_signal_connect (tree_view->renderer_cell, "clicked", + G_CALLBACK (gimp_vectors_tree_view_vectors_clicked), + view); + /* hide basically useless edit button */ gtk_widget_hide (gimp_item_tree_view_get_edit_button (GIMP_ITEM_TREE_VIEW (view))); @@ -258,6 +268,37 @@ gimp_vectors_tree_view_item_new (GimpImage *image) return GIMP_ITEM (new_vectors); } +static void +gimp_vectors_tree_view_vectors_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view) +{ + if (state & GDK_MOD1_MASK) + { + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; + const gchar *action = "vectors-selection-replace"; + + group = gimp_ui_manager_get_action_group (ui_manager, "vectors"); + + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "vectors-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "vectors-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "vectors-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } +} + static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, gsize *svg_data_len, diff --git a/data/tags/Makefile.am b/data/tags/Makefile.am index 2d4703c694..f40debf7a5 100644 --- a/data/tags/Makefile.am +++ b/data/tags/Makefile.am @@ -17,7 +17,7 @@ DISTCLEANFILES = $(tagsdata_data_files) gimp-tags-default.xml: gimp-tags-default.xml.in $(wildcard $(top_srcdir)/po-tags/*.po) - $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -x -u -c $(top_builddir)/po/.intltool-merge-cache + $(INTLTOOL_MERGE) $(top_srcdir)/po-tags $< $(@) -x -u -c $(top_builddir)/po-tags/.intltool-merge-cache validate: gimp-tags-default.xml diff --git a/data/tags/gimp-tags-default.xml.in b/data/tags/gimp-tags-default.xml.in index b7722fa59a..5bb3b84232 100644 --- a/data/tags/gimp-tags-default.xml.in +++ b/data/tags/gimp-tags-default.xml.in @@ -26,60 +26,144 @@ + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + diff --git a/libgimpwidgets/gimpcolorscale.c b/libgimpwidgets/gimpcolorscale.c index c275dbc013..5d8f9f633f 100644 --- a/libgimpwidgets/gimpcolorscale.c +++ b/libgimpwidgets/gimpcolorscale.c @@ -79,13 +79,15 @@ gimp_color_scale_init (GimpColorScale *scale) GTK_SCALE (scale)->draw_value = FALSE; range->slider_size_fixed = TRUE; - range->orientation = GTK_ORIENTATION_HORIZONTAL; range->flippable = TRUE; /* range->update_policy = GTK_UPDATE_DELAYED; */ scale->channel = GIMP_COLOR_SELECTOR_VALUE; scale->needs_render = TRUE; + gtk_orientable_set_orientation (GTK_ORIENTABLE (range), + GTK_ORIENTATION_HORIZONTAL); + gimp_rgba_set (&scale->rgb, 0.0, 0.0, 0.0, 1.0); gimp_rgb_to_hsv (&scale->rgb, &scale->hsv); } @@ -142,7 +144,7 @@ gimp_color_scale_size_allocate (GtkWidget *widget, scale_width = range->range_rect.width - 2 * (focus + trough_border); scale_height = range->range_rect.height - 2 * (focus + trough_border); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: scale_width -= range->min_slider_size - 1; @@ -311,7 +313,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_gc_set_clip_rectangle (style->black_gc, &area); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: gdk_draw_rgb_image_dithalign (window, @@ -351,7 +353,7 @@ gimp_color_scale_expose (GtkWidget *widget, range->range_rect.width, range->range_rect.height); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: area.x = widget->allocation.x + range->slider_start; @@ -377,7 +379,8 @@ gimp_color_scale_expose (GtkWidget *widget, style->dark_gc[GTK_STATE_INSENSITIVE]); gdk_gc_set_clip_rectangle (gc, &expose_area); - switch (range->orientation) + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (w = area.width, x = area.x, y = area.y; @@ -390,6 +393,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_draw_line (window, gc, x, y, x, y + h - 1); break; } + gdk_gc_set_clip_rectangle (gc, NULL); gc = (GTK_WIDGET_IS_SENSITIVE (widget) ? @@ -397,7 +401,8 @@ gimp_color_scale_expose (GtkWidget *widget, style->light_gc[GTK_STATE_INSENSITIVE]); gdk_gc_set_clip_rectangle (gc, &expose_area); - switch (range->orientation) + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (w = area.width, x = area.x, y = area.y + area.height - 1; @@ -410,6 +415,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_draw_line (window, gc, x, y, x, y + h - 1); break; } + gdk_gc_set_clip_rectangle (gc, NULL); } @@ -429,16 +435,13 @@ GtkWidget * gimp_color_scale_new (GtkOrientation orientation, GimpColorSelectorChannel channel) { - GimpColorScale *scale; - GtkRange *range; - - scale = g_object_new (GIMP_TYPE_COLOR_SCALE, NULL); + GimpColorScale *scale = g_object_new (GIMP_TYPE_COLOR_SCALE, + "orientation", orientation, + NULL); scale->channel = channel; - range = GTK_RANGE (scale); - range->orientation = orientation; - range->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL); + GTK_RANGE (scale)->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL); return GTK_WIDGET (scale); } @@ -493,7 +496,8 @@ gimp_color_scale_set_color (GimpColorScale *scale, static gboolean should_invert (GtkRange *range) { - if (range->orientation == GTK_ORIENTATION_HORIZONTAL) + if (gtk_orientable_get_orientation (GTK_ORIENTABLE (range)) == + GTK_ORIENTATION_HORIZONTAL) return (range->inverted && !range->flippable) || (range->inverted && range->flippable && @@ -555,7 +559,7 @@ gimp_color_scale_render (GimpColorScale *scale) invert = should_invert (range); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (x = 0, d = buf; x < scale->width; x++, d += 3) @@ -625,7 +629,7 @@ gimp_color_scale_render_alpha (GimpColorScale *scale) buf = scale->buf; rgb = scale->rgb; - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: { diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index c58408855a..b2b944d390 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -606,7 +606,8 @@ gimp_unit_menu_create_selection (GimpUnitMenu *menu) /* the main vbox */ vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (menu->selection)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (menu->selection))), + vbox); gtk_widget_show (vbox); /* the selection list */ diff --git a/libgimpwidgets/test-eevl.c b/libgimpwidgets/test-eevl.c index eb1bbda45e..a41eacc774 100644 --- a/libgimpwidgets/test-eevl.c +++ b/libgimpwidgets/test-eevl.c @@ -5,10 +5,10 @@ * Copyright (C) 2008 Fredrik Alstromer * Copyright (C) 2008 Martin Nordholts * - * This library is free software; you can redistribute it and/or + * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,8 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see + * . */ /* A small regression test case for the evaluator */ diff --git a/plug-ins/color-rotate/color-rotate-dialog.c b/plug-ins/color-rotate/color-rotate-dialog.c index e23f563943..1817bdb562 100644 --- a/plug-ins/color-rotate/color-rotate-dialog.c +++ b/plug-ins/color-rotate/color-rotate-dialog.c @@ -675,8 +675,8 @@ color_rotate_dialog (void) /* H-Box */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (hbox), previews, TRUE, TRUE, 0); diff --git a/plug-ins/common/alien-map.c b/plug-ins/common/alien-map.c index 83c02536f7..ccd27ceb5f 100644 --- a/plug-ins/common/alien-map.c +++ b/plug-ins/common/alien-map.c @@ -407,7 +407,8 @@ alienmap2_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 6daebd10b5..be11a7ac03 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -416,8 +416,8 @@ align_layers_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); combo = gimp_int_combo_box_new (_("None"), H_NONE, diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c index dc6f4614fa..f11db63e9e 100644 --- a/plug-ins/common/apply-canvas.c +++ b/plug-ins/common/apply-canvas.c @@ -1277,7 +1277,8 @@ struc_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index a2aebdbffe..53d8d173e1 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -237,7 +237,8 @@ blinds_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss-selective.c b/plug-ins/common/blur-gauss-selective.c index 74c87ef85a..aa32cbb476 100644 --- a/plug-ins/common/blur-gauss-selective.c +++ b/plug-ins/common/blur-gauss-selective.c @@ -246,7 +246,8 @@ sel_gauss_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss.c b/plug-ins/common/blur-gauss.c index 57f93c56b1..3a483f6dce 100644 --- a/plug-ins/common/blur-gauss.c +++ b/plug-ins/common/blur-gauss.c @@ -492,7 +492,8 @@ gauss_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-motion.c b/plug-ins/common/blur-motion.c index 475aa84a4a..cfb4fff9f7 100644 --- a/plug-ins/common/blur-motion.c +++ b/plug-ins/common/blur-motion.c @@ -1026,7 +1026,8 @@ mblur_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index 6e09c56ff0..66f4b85aae 100644 --- a/plug-ins/common/border-average.c +++ b/plug-ins/common/border-average.c @@ -365,7 +365,8 @@ borderaverage_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Border Size")); diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c index ac05020eb8..99a29b0f21 100644 --- a/plug-ins/common/bump-map.c +++ b/plug-ins/common/bump-map.c @@ -780,7 +780,8 @@ bumpmap_dialog (void) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c index 4c7caa94f3..d3069de204 100644 --- a/plug-ins/common/cartoon.c +++ b/plug-ins/common/cartoon.c @@ -825,7 +825,8 @@ cartoon_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/channel-mixer.c b/plug-ins/common/channel-mixer.c index a8f7bff959..374683d0d5 100644 --- a/plug-ins/common/channel-mixer.c +++ b/plug-ins/common/channel-mixer.c @@ -506,7 +506,8 @@ cm_dialog (CmParamsType *mix, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 423a9ea4d8..72cff6af30 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -360,7 +360,8 @@ checkerboard_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index 919151cf06..e3f07134a8 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -1193,8 +1193,8 @@ CML_explorer_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); @@ -1826,8 +1826,8 @@ function_graph_new (GtkWidget *widget, frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + frame, FALSE, FALSE, 0); gtk_widget_show (frame); preview = gtk_drawing_area_new (); diff --git a/plug-ins/common/color-cube-analyze.c b/plug-ins/common/color-cube-analyze.c index 77bde0dffc..23f46deb58 100644 --- a/plug-ins/common/color-cube-analyze.c +++ b/plug-ins/common/color-cube-analyze.c @@ -364,8 +364,8 @@ doDialog (void) vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c index dbec3aa84d..07f39ed714 100644 --- a/plug-ins/common/color-exchange.c +++ b/plug-ins/common/color-exchange.c @@ -302,7 +302,8 @@ exchange_dialog (GimpDrawable *drawable) /* do some boxes here */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Middle-Click Inside Preview to Pick \"From Color\"")); diff --git a/plug-ins/common/color-to-alpha.c b/plug-ins/common/color-to-alpha.c index cba41ca369..d3f3a73eff 100644 --- a/plug-ins/common/color-to-alpha.c +++ b/plug-ins/common/color-to-alpha.c @@ -391,7 +391,8 @@ color_to_alpha_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index e850ef6cf4..3b5a0243db 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -269,7 +269,8 @@ colorify_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 810e07e621..9436a397cb 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -612,7 +612,8 @@ remap_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); cmap = gimp_image_get_colormap (image_ID, &ncols); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 27dae2fea7..fa8b9123f9 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -1506,7 +1506,8 @@ compose_dialog (const gchar *compose_type, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Compose type combo */ diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index 12568e1290..669e91ad42 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -300,7 +300,8 @@ retinex_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/convolution-matrix.c b/plug-ins/common/convolution-matrix.c index 9b50106d70..5d4e94a37f 100644 --- a/plug-ins/common/convolution-matrix.c +++ b/plug-ins/common/convolution-matrix.c @@ -922,7 +922,8 @@ convolve_image_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index 454e9f1429..face4febe4 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -282,7 +282,8 @@ cubism_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, &cvals.preview); diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 217c0cbbf3..ee1b0dd5e7 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -1240,7 +1240,8 @@ bender_new_dialog (GimpDrawable *drawable) /* The main hbox */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cd->shell)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cd->shell))), + main_hbox); gtk_widget_show (main_hbox); /* Left side column */ diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index e6292841a0..d55e96459d 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -1495,8 +1495,8 @@ decompose_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Extract Channels")); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index e57580a8b6..4a8942becd 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -336,7 +336,8 @@ deinterlace_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index 0df53fcd70..1ba05fda6b 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -659,7 +659,7 @@ DepthMerge_dialog (DepthMerge *dm) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 08765f0770..773d457ff3 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -439,7 +439,8 @@ despeckle_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 4bd13aa9a9..dc5d6932f5 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -452,7 +452,8 @@ destripe_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 54fcbca932..3787a770c9 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -448,8 +448,8 @@ diffraction_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* Preview */ diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 6031e9b695..b0dc342567 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -340,7 +340,8 @@ displace_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c index 7451837f5d..ba96cc7d81 100644 --- a/plug-ins/common/edge-dog.c +++ b/plug-ins/common/edge-dog.c @@ -314,7 +314,8 @@ dog_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c index a2584ae852..6e6632cf5c 100644 --- a/plug-ins/common/edge-neon.c +++ b/plug-ins/common/edge-neon.c @@ -709,7 +709,8 @@ neon_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-sobel.c b/plug-ins/common/edge-sobel.c index f73123c72b..3d645b5ab6 100644 --- a/plug-ins/common/edge-sobel.c +++ b/plug-ins/common/edge-sobel.c @@ -245,7 +245,8 @@ sobel_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 77af9e437a..383092dd84 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -643,7 +643,8 @@ edge_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 64a1978271..c9ee2b6ac5 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -461,7 +461,8 @@ emboss_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index f81505a609..eeaee31d80 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -223,7 +223,8 @@ engrave_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c index 57d344fa24..7a86991404 100644 --- a/plug-ins/common/file-aa.c +++ b/plug-ins/common/file-aa.c @@ -363,7 +363,7 @@ aa_dialog (gint selected) hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c index 507a081e8f..7f6a76ae94 100644 --- a/plug-ins/common/file-csource.c +++ b/plug-ins/common/file-csource.c @@ -674,7 +674,8 @@ run_save_dialog (Config *config) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); table = gtk_table_new (2, 2, FALSE); diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index 7d877cd9aa..4380ce5655 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -749,7 +749,8 @@ save_dialog (void) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); spinbutton = gimp_spin_button_new (&adj, diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c index b63c5f714f..7162e497de 100644 --- a/plug-ins/common/file-gif-save.c +++ b/plug-ins/common/file-gif-save.c @@ -1023,7 +1023,8 @@ save_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* regular gif parameter settings */ diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index f4116ebd61..f33a67c79f 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -880,7 +880,8 @@ gih_save_dialog (gint32 image_ID) gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c index b3e278c791..e1c9bdbdbc 100644 --- a/plug-ins/common/file-html-table.c +++ b/plug-ins/common/file-html-table.c @@ -423,8 +423,8 @@ save_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); if (gimp_image_width (image_ID) * gimp_image_height (image_ID) > 4096) { diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c index e9d6a4e75a..f95bb337c6 100644 --- a/plug-ins/common/file-mng.c +++ b/plug-ins/common/file-mng.c @@ -1268,7 +1268,8 @@ mng_save_dialog (gint32 image_id) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); frame = gimp_frame_new (_("MNG Options")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c index a3f9fa3fde..b4d2977f75 100644 --- a/plug-ins/common/file-pat.c +++ b/plug-ins/common/file-pat.c @@ -544,7 +544,8 @@ save_dialog (void) table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); entry = gtk_entry_new (); diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c index 36fa328c1b..bebffcc2f2 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf.c @@ -832,7 +832,8 @@ load_dialog (PopplerDocument *doc, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Title */ diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 8ebde1a6e0..f0706611e1 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -1031,7 +1031,7 @@ load_image (const gchar *filename, { gchar *comment = NULL; - for (i = 0; i < num_texts && !comment; i++) + for (i = 0; i < num_texts && !comment; i++, text++) { if (text->key == NULL || strcmp (text->key, "Comment")) continue; @@ -1808,7 +1808,7 @@ save_dialog (gint32 image_ID, gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index 64b5aa5043..e245258336 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -1207,7 +1207,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 083125ab93..ba84323b6c 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -3106,8 +3106,8 @@ load_dialog (const gchar *filename, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); if (page_count > 1) @@ -3345,8 +3345,8 @@ save_dialog (void) /* Main hbox */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); main_vbox[0] = main_vbox[1] = NULL; for (j = 0; j < G_N_ELEMENTS (main_vbox); j++) diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 1e77b26205..a347fa5aab 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -664,7 +664,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-raw.c b/plug-ins/common/file-raw.c index 0d8b8cab92..b630a1239e 100644 --- a/plug-ins/common/file-raw.c +++ b/plug-ins/common/file-raw.c @@ -1065,7 +1065,8 @@ load_dialog (const gchar *filename) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gtk_frame_new (NULL); @@ -1243,8 +1244,8 @@ save_dialog (const gchar *filename, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); frame = gimp_int_radio_group_new (TRUE, _("RGB Save Type"), diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index fd731e6b4a..560de91487 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -1652,7 +1652,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index b29bad9a35..7646ab4fac 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -746,8 +746,8 @@ load_dialog (const gchar *filename, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The SVG preview */ diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index 86170609dc..736a76446d 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -1382,7 +1382,7 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c index 6060fbfccf..35af888c24 100644 --- a/plug-ins/common/file-tiff-load.c +++ b/plug-ins/common/file-tiff-load.c @@ -493,7 +493,8 @@ load_dialog (TIFF *tif, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Page Selector */ diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c index 70d61a9dae..03b3d9fbc4 100644 --- a/plug-ins/common/file-tiff-save.c +++ b/plug-ins/common/file-tiff-save.c @@ -1076,7 +1076,7 @@ save_dialog (gboolean has_alpha, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, TRUE, 0); /* compression */ diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index a97be67291..fe2ee46b43 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -516,8 +516,8 @@ load_dialog (const gchar *filename) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The WMF preview */ diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 90d44ec1fc..81a00f2431 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -1201,7 +1201,7 @@ save_dialog (gint32 drawable_ID) /* parameter settings */ frame = gimp_frame_new (_("XBM Options")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 811fb18872..1894bb7b7f 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -1076,7 +1076,7 @@ save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange) */ frame = gimp_frame_new (_("XMC Options")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index da8a398285..f6873cdd3c 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -820,7 +820,7 @@ save_dialog (void) table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index c82b9e3e0e..5515bc4ce4 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1262,7 +1262,8 @@ film_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); notebook = gtk_notebook_new (); diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c index 2bf820a780..2d7930489c 100644 --- a/plug-ins/common/filter-pack.c +++ b/plug-ins/common/filter-pack.c @@ -1241,7 +1241,8 @@ fp_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); gtk_table_attach (GTK_TABLE (table), bna, 0, 2, 0, 1, diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c index 48abb55c1c..2d07c42292 100644 --- a/plug-ins/common/fractal-trace.c +++ b/plug-ins/common/fractal-trace.c @@ -705,7 +705,8 @@ dialog_show (void) mainbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (mainbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), mainbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + mainbox); gtk_widget_show (mainbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/gee-zoom.c b/plug-ins/common/gee-zoom.c index 60eb28f85a..0fd61f0f1d 100644 --- a/plug-ins/common/gee-zoom.c +++ b/plug-ins/common/gee-zoom.c @@ -217,7 +217,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index b40f699b22..2d66d2c1cc 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -178,7 +178,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 69b1c34f39..15a0c51ac9 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -653,7 +653,8 @@ dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 0feb0544b9..0f105f2b95 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -600,7 +600,8 @@ plugin_dialog (piArgs *argp) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index 8988e45f6b..a63e22cc91 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -364,7 +364,8 @@ illusion_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 2f22edd843..2264beb8f6 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -1308,8 +1308,8 @@ iwarp_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index 4c9fa93d46..264168dde7 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -2430,7 +2430,8 @@ jigsaw_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c index 1985a5840e..7bf2898240 100644 --- a/plug-ins/common/lcms.c +++ b/plug-ins/common/lcms.c @@ -1246,7 +1246,8 @@ lcms_icc_apply_dialog (gint32 image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); label = lcms_icc_profile_src_label_new (image, src_profile); @@ -1471,7 +1472,8 @@ lcms_dialog (GimpColorConfig *config, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Current Color Profile")); diff --git a/plug-ins/common/lens-apply.c b/plug-ins/common/lens-apply.c index cc31e83a03..773d0468b0 100644 --- a/plug-ins/common/lens-apply.c +++ b/plug-ins/common/lens-apply.c @@ -407,7 +407,8 @@ lens_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lens-distortion.c b/plug-ins/common/lens-distortion.c index dcaac58c15..ee82a151bc 100644 --- a/plug-ins/common/lens-distortion.c +++ b/plug-ins/common/lens-distortion.c @@ -497,7 +497,8 @@ lens_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/lens-flare.c b/plug-ins/common/lens-flare.c index 5ec7971daf..6f665fae42 100644 --- a/plug-ins/common/lens-flare.c +++ b/plug-ins/common/lens-flare.c @@ -320,7 +320,8 @@ flare_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index e84a22c2c6..fc13a08e6a 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -422,7 +422,7 @@ save_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); diff --git a/plug-ins/common/max-rgb.c b/plug-ins/common/max-rgb.c index aa9dfc0200..c46a559544 100644 --- a/plug-ins/common/max-rgb.c +++ b/plug-ins/common/max-rgb.c @@ -273,7 +273,8 @@ max_rgb_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 6e13ed6ca1..88348cfc69 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -607,7 +607,8 @@ mosaic_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* A preview */ diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 10021d5915..c4696095d1 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1202,7 +1202,8 @@ newsprint_dialog (GimpDrawable *drawable) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index 668582c29a..7da64514db 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -1030,7 +1030,8 @@ nlfilter_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-hsv.c b/plug-ins/common/noise-hsv.c index 059b232a57..ae28a789f2 100644 --- a/plug-ins/common/noise-hsv.c +++ b/plug-ins/common/noise-hsv.c @@ -378,7 +378,8 @@ scatter_hsv_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-randomize.c b/plug-ins/common/noise-randomize.c index 61fdbabda9..6e7d0d6b28 100644 --- a/plug-ins/common/noise-randomize.c +++ b/plug-ins/common/noise-randomize.c @@ -746,7 +746,8 @@ randomize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-rgb.c b/plug-ins/common/noise-rgb.c index e42b68e317..23daf7a559 100644 --- a/plug-ins/common/noise-rgb.c +++ b/plug-ins/common/noise-rgb.c @@ -464,7 +464,8 @@ noisify_dialog (GimpDrawable *drawable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c index b8fdb58517..59c91542da 100644 --- a/plug-ins/common/noise-solid.c +++ b/plug-ins/common/noise-solid.c @@ -577,7 +577,8 @@ solid_noise_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-spread.c b/plug-ins/common/noise-spread.c index 74e70b7479..ae4b2344eb 100644 --- a/plug-ins/common/noise-spread.c +++ b/plug-ins/common/noise-spread.c @@ -358,7 +358,8 @@ spread_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index b79787a5b3..54835eade2 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -318,7 +318,8 @@ nova_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index eb20b933e9..9bb783b794 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -791,7 +791,8 @@ oilify_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c index dc712ceb55..1d11ca0226 100644 --- a/plug-ins/common/photocopy.c +++ b/plug-ins/common/photocopy.c @@ -853,7 +853,8 @@ photocopy_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index f107a46a63..2d2074daa2 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -330,7 +330,8 @@ pixelize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index 4027400211..b93012d484 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -314,7 +314,8 @@ plasma_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index bbfc974f2c..c4a08e90d2 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -564,7 +564,7 @@ browser_dialog_new (void) browser->browser = gimp_browser_new (); gtk_container_set_border_width (GTK_CONTAINER (browser->browser), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (browser->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (browser->dialog))), browser->browser); gtk_widget_show (browser->browser); diff --git a/plug-ins/common/polar-coords.c b/plug-ins/common/polar-coords.c index 4a60efe7fd..7593febf7b 100644 --- a/plug-ins/common/polar-coords.c +++ b/plug-ins/common/polar-coords.c @@ -607,7 +607,8 @@ polarize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Preview */ diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index 3136d6cbaa..611e97ef02 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -817,8 +817,8 @@ dialog_run (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); table = gtk_table_new (3, 3, FALSE); diff --git a/plug-ins/common/red-eye-removal.c b/plug-ins/common/red-eye-removal.c index c41d1cf255..31a113a79b 100644 --- a/plug-ins/common/red-eye-removal.c +++ b/plug-ins/common/red-eye-removal.c @@ -154,7 +154,8 @@ dialog (gint32 image_id, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index 1782107029..8066f2268b 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -498,7 +498,8 @@ ripple_dialog (GimpDrawable *drawable) /* The main vbox */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index 640fe3eb4d..91b63315e2 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -1343,7 +1343,7 @@ smp_dialog (void) gtk_table_set_row_spacings (GTK_TABLE (table), 12); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); ty = 0; diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index 9d7d6ac7c0..475d95bfa3 100644 --- a/plug-ins/common/screenshot.c +++ b/plug-ins/common/screenshot.c @@ -1082,8 +1082,8 @@ shoot_dialog (GdkScreen **screen) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); /* Hints */ diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index bf3ef3ace1..2c14e431c5 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -490,7 +490,8 @@ sharpen_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 6be8d1e140..0361cea21e 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -369,7 +369,8 @@ shift_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index d55273aecc..47a075c0b1 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -662,8 +662,8 @@ sinus_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); /* Create preview */ diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 8249169868..82fa274b98 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -442,8 +442,9 @@ dialog (GimpDrawable *drawable) 1, GIMP_MAX_IMAGE_SIZE, 1, GIMP_MAX_IMAGE_SIZE); gtk_container_set_border_width (GTK_CONTAINER (sizeentry), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sizeentry, - FALSE, FALSE, 0); gtk_widget_show (sizeentry); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + sizeentry, FALSE, FALSE, 0); + gtk_widget_show (sizeentry); spinbutton = gimp_spin_button_new (&adj, config.ntries, 1, 1024, 1, 10, 0, 1, 0); diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c index 951ee024d1..bc15b6555f 100644 --- a/plug-ins/common/softglow.c +++ b/plug-ins/common/softglow.c @@ -646,7 +646,8 @@ softglow_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index f46a3b2f89..a544ab968c 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -351,7 +351,8 @@ sparkle_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 38d42d4e82..7578e201b1 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -2564,7 +2564,8 @@ makewindow (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + main_vbox); gtk_widget_show (main_vbox); main_hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/threshold-alpha.c b/plug-ins/common/threshold-alpha.c index e4871c0053..5f0b82c936 100644 --- a/plug-ins/common/threshold-alpha.c +++ b/plug-ins/common/threshold-alpha.c @@ -262,7 +262,8 @@ threshold_alpha_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-glass.c b/plug-ins/common/tile-glass.c index d395dc7dfc..ba47a01435 100644 --- a/plug-ins/common/tile-glass.c +++ b/plug-ins/common/tile-glass.c @@ -264,7 +264,8 @@ glasstile_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-paper.c b/plug-ins/common/tile-paper.c index 56f45d60e8..189f0de693 100644 --- a/plug-ins/common/tile-paper.c +++ b/plug-ins/common/tile-paper.c @@ -257,7 +257,8 @@ open_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox); gtk_widget_show (main_hbox); /* Left */ diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index 23df220635..e3cf44e6c0 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -378,8 +378,8 @@ tileit_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 0411b10c3d..08af0294f3 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -415,7 +415,8 @@ tile_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Tile to New Size")); diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c index d5761bf769..dcda56f2c6 100644 --- a/plug-ins/common/unit-editor.c +++ b/plug-ins/common/unit-editor.c @@ -222,8 +222,8 @@ new_unit_dialog (GtkWidget *main_dialog, gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); entry = identifier_entry = gtk_entry_new (); @@ -449,8 +449,8 @@ unit_editor_dialog (void) -1, NULL); toolbar = gtk_ui_manager_get_widget (ui_manager, "/unit-editor-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); scrolled_win = gtk_scrolled_window_new (NULL, NULL); @@ -460,7 +460,7 @@ unit_editor_dialog (void) GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled_win); gtk_widget_show (scrolled_win); diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c index a784eda93c..de23822d09 100644 --- a/plug-ins/common/unsharp-mask.c +++ b/plug-ins/common/unsharp-mask.c @@ -844,7 +844,8 @@ unsharp_mask_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/value-propagate.c b/plug-ins/common/value-propagate.c index b926a66f3b..cf27cc4a7f 100644 --- a/plug-ins/common/value-propagate.c +++ b/plug-ins/common/value-propagate.c @@ -1103,7 +1103,8 @@ vpropagate_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index ee0e879d53..98353b1aff 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -655,7 +655,8 @@ create_main_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index e422de90d7..6b432e5d18 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -2031,7 +2031,8 @@ video_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* frame for the radio buttons */ diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 173c24d7fb..beaf28a927 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -390,7 +390,8 @@ warp_dialog (GimpDrawable *drawable) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Basic Options")); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 9a67406eef..bdf12495b8 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -263,7 +263,8 @@ waves_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/whirl-pinch.c b/plug-ins/common/whirl-pinch.c index b2a3f19485..060a46ba41 100644 --- a/plug-ins/common/whirl-pinch.c +++ b/plug-ins/common/whirl-pinch.c @@ -542,7 +542,8 @@ whirl_pinch_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 3c17ad236e..2999615ff7 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -893,7 +893,8 @@ dialog_box (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c index cb5f8cde24..7e08cff5d3 100644 --- a/plug-ins/file-bmp/bmp-write.c +++ b/plug-ins/file-bmp/bmp-write.c @@ -809,7 +809,8 @@ save_dialog (gint channels) vbox_main = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox_main), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox_main); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox_main); gtk_widget_show (vbox_main); toggle = gtk_check_button_new_with_mnemonic (_("_Run-Length Encoded")); diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 02c30b8d40..a4c92c3f26 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -1009,8 +1009,8 @@ load_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Replacement for undefined pixels"), diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index 86cc9cc046..2f4bbaf529 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -860,8 +860,8 @@ load_dialog (const gchar *filename) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* @@ -930,8 +930,8 @@ save_dialog (gint32 image_id) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c index c1942756db..26c1690cc5 100644 --- a/plug-ins/file-ico/ico-dialog.c +++ b/plug-ins/file-ico/ico-dialog.c @@ -78,8 +78,8 @@ ico_dialog_new (IcoSaveInfo *info) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Icon Details")); diff --git a/plug-ins/file-jpeg/jpeg-exif.c b/plug-ins/file-jpeg/jpeg-exif.c index 5d66629674..3df5e5925c 100644 --- a/plug-ins/file-jpeg/jpeg-exif.c +++ b/plug-ins/file-jpeg/jpeg-exif.c @@ -307,7 +307,7 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index dffd49ae25..35bebc0231 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -854,7 +854,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); table = gtk_table_new (1, 3, FALSE); @@ -1179,7 +1180,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); tabledefaults = gtk_table_new (1, 3, FALSE); diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index f29de09a9b..a2dd761445 100644 --- a/plug-ins/file-psd/psd-save.c +++ b/plug-ins/file-psd/psd-save.c @@ -416,7 +416,7 @@ write_pascalstring (FILE *fd, } else { - write_gint16 (fd, 0, why); + write_gchar (fd, 0, why); } /* If total length (length byte + content) is not a multiple of PADDING, diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index 952daa2ce0..5c9913b2fb 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -655,7 +655,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/file-xjt/xjt.c b/plug-ins/file-xjt/xjt.c index 58c0383c22..22d3293dc2 100644 --- a/plug-ins/file-xjt/xjt.c +++ b/plug-ins/file-xjt/xjt.c @@ -882,7 +882,8 @@ save_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); toggle = gtk_check_button_new_with_label (_("Optimize")); diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 0720647abc..f83eac26f4 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -662,8 +662,8 @@ edit_callback (GtkWidget *widget, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (edit_dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (edit_dialog))), + main_vbox, FALSE, FALSE, 0); frame = gimp_frame_new (_("Directions")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); @@ -982,8 +982,8 @@ flame_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); box = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c index e0f33888b6..88ec2f0a88 100644 --- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c +++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c @@ -585,8 +585,8 @@ explorer_dialog (void) top_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (top_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), top_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + top_hbox, FALSE, FALSE, 0); gtk_widget_show (top_hbox); left_vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index 770d9082ad..5d1eca21d1 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -1132,8 +1132,8 @@ fractalexplorer_rescan_list (GtkWidget *widget, patheditor = gimp_path_editor_new (_("Add FractalExplorer Path"), fractalexplorer_path); gtk_container_set_border_width (GTK_CONTAINER (patheditor), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), patheditor, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + patheditor, TRUE, TRUE, 0); gtk_widget_show (patheditor); if (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK) diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 43f5d86318..c27558bc3c 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -306,12 +306,12 @@ gfig_dialog (void) /* build the menu */ ui_manager = create_ui_manager (top_level_dlg); menubar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-menubar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), menubar, FALSE, FALSE, 0); gtk_widget_show (menubar); toolbar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-toolbar"); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); @@ -320,8 +320,8 @@ gfig_dialog (void) /* Main box */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), + main_hbox, TRUE, TRUE, 0); /* Preview itself */ gtk_box_pack_start (GTK_BOX (main_hbox), make_preview (), FALSE, FALSE, 0); @@ -1220,7 +1220,8 @@ gfig_prefs_action_callback (GtkAction *widget, main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Put buttons in */ @@ -1368,7 +1369,8 @@ gfig_grid_action_callback (GtkAction *action, main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); hbox = gtk_hbox_new (FALSE, 6); diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c index e4a3efe7ff..72771a4738 100644 --- a/plug-ins/gimpressionist/gimpressionist.c +++ b/plug-ins/gimpressionist/gimpressionist.c @@ -160,7 +160,8 @@ create_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox); gtk_widget_show (hbox); preview_box = create_preview (); diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 2f8bfc525c..f9491d702a 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -547,7 +547,7 @@ create_orientmap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (orient_map_window)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (orient_map_window))), table1); gtk_widget_show (table1); diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 2c795f14ae..746b0114ee 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -659,7 +659,8 @@ create_save_preset (GtkWidget *parent) box = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), box); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + box); gtk_widget_show (box); label = gtk_label_new (_("Description:")); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 953023a5da..8fbec985a8 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -422,7 +422,8 @@ create_sizemap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (smwindow)->vbox), table1); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (smwindow))), + table1); gtk_widget_show (table1); tmpw2 = tmpw = gtk_frame_new (_("Smvectors")); diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index d06c6fb856..5273d8f97d 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -2373,8 +2373,8 @@ dlg_run (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* @@ -3342,8 +3342,8 @@ ed_run (GtkWindow *parent, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 110de80a7c..f58194e4e9 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -801,15 +801,15 @@ ifs_compose_dialog (GimpDrawable *drawable) toolbar = gtk_ui_manager_get_widget (ifsDesign->ui_manager, "/ifs-compose-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); /* The main vbox */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); /* The design area */ @@ -1191,8 +1191,8 @@ ifs_options_dialog (GtkWidget *parent) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ifsOptD->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (ifsOptD->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); label = gtk_label_new (_("Max. memory:")); diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c index 13a31d9489..309fad37f3 100644 --- a/plug-ins/imagemap/imap_default_dialog.c +++ b/plug-ins/imagemap/imap_default_dialog.c @@ -121,8 +121,8 @@ make_default_dialog (const gchar *title) data->vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (data->dialog)->vbox), data->vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))), + data->vbox, TRUE, TRUE, 0); gtk_widget_show (data->vbox); return data; diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index d2888ec9d8..67b0e85064 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -1033,8 +1033,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index c6dde1d2f8..0066bf200d 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -1350,8 +1350,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/maze/maze-dialog.c b/plug-ins/maze/maze-dialog.c index 9ac8a8c572..d52d9de9d5 100644 --- a/plug-ins/maze/maze-dialog.c +++ b/plug-ins/maze/maze-dialog.c @@ -186,7 +186,7 @@ maze_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); /* The maze size frame */ diff --git a/plug-ins/metadata/interface.c b/plug-ins/metadata/interface.c index e261bdb49a..12cf001d2f 100644 --- a/plug-ins/metadata/interface.c +++ b/plug-ins/metadata/interface.c @@ -682,8 +682,8 @@ metadata_dialog (gint32 image_ID, notebook = gtk_notebook_new (); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP); gtk_container_set_border_width (GTK_CONTAINER (notebook), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (mgui.dlg)->vbox), notebook, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (mgui.dlg))), + notebook, TRUE, TRUE, 0); gtk_widget_show (notebook); mgui.xmp_model = xmp_model; diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 0ad65b6a77..8db61dac1f 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -454,7 +454,7 @@ dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c index e31c34ba37..456a54b973 100644 --- a/plug-ins/script-fu/script-fu-console.c +++ b/plug-ins/script-fu/script-fu-console.c @@ -154,8 +154,8 @@ script_fu_console_interface (void) /* The main vbox */ vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (console.dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (console.dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); /* The output text widget */ diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 76d55041d3..b289f660f4 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -254,7 +254,7 @@ script_fu_interface (SFScript *script, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 0957bed7e7..35585f6c5f 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -735,7 +735,7 @@ server_interface (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), table, FALSE, FALSE, 0); /* The server port */ diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c index b7ca2b50d7..09dde9f364 100644 --- a/plug-ins/selection-to-path/selection-to-path.c +++ b/plug-ins/selection-to-path/selection-to-path.c @@ -326,7 +326,8 @@ sel2path_dialog (SELVALS *sels) table = dialog_create_selection_area (sels); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table); gtk_widget_show (table); gtk_widget_show (dlg); diff --git a/plug-ins/win-snap/winsnap.c b/plug-ins/win-snap/winsnap.c index a426a86307..2c92e82563 100644 --- a/plug-ins/win-snap/winsnap.c +++ b/plug-ins/win-snap/winsnap.c @@ -872,7 +872,8 @@ snap_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); winsnapintf.single_button = diff --git a/po-libgimp/POTFILES.skip b/po-libgimp/POTFILES.skip index 569959ecdc..2d14b64b10 100644 --- a/po-libgimp/POTFILES.skip +++ b/po-libgimp/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-plug-ins/POTFILES.skip b/po-plug-ins/POTFILES.skip index db4fe48c3e..c2f26c06b5 100644 --- a/po-plug-ins/POTFILES.skip +++ b/po-plug-ins/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-plug-ins/ru.po b/po-plug-ins/ru.po index e790f675a9..d04da7afa7 100644 --- a/po-plug-ins/ru.po +++ b/po-plug-ins/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-22 15:16+0400\n" -"PO-Revision-Date: 2009-06-23 18:18+0400\n" +"POT-Creation-Date: 2009-07-16 17:48+0400\n" +"PO-Revision-Date: 2009-07-16 17:47+0400\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "Весь слой" #. Create selection #: ../plug-ins/color-rotate/color-rotate-dialog.c:172 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:366 -#: ../plug-ins/selection-to-path/selection-to-path.c:432 +#: ../plug-ins/selection-to-path/selection-to-path.c:433 msgid "Selection" msgstr "Выделение" @@ -54,7 +54,7 @@ msgstr "Контекст" #. spinbutton 1 #: ../plug-ins/color-rotate/color-rotate-dialog.c:298 #: ../plug-ins/color-rotate/color-rotate-dialog.c:376 -#: ../plug-ins/common/color-to-alpha.c:409 ../plug-ins/file-fli/fli-gimp.c:874 +#: ../plug-ins/common/color-to-alpha.c:410 ../plug-ins/file-fli/fli-gimp.c:874 #: ../plug-ins/file-fli/fli-gimp.c:944 msgid "From:" msgstr "Из:" @@ -249,27 +249,27 @@ msgstr "Чужое отображение: преобразование" msgid "Alien Map" msgstr "Чужое отображение" -#: ../plug-ins/common/alien-map.c:440 ../plug-ins/common/alien-map.c:464 -#: ../plug-ins/common/alien-map.c:488 +#: ../plug-ins/common/alien-map.c:441 ../plug-ins/common/alien-map.c:465 +#: ../plug-ins/common/alien-map.c:489 msgid "Number of cycles covering full value range" msgstr "Количество циклов, покрывающее все возможные значения" -#: ../plug-ins/common/alien-map.c:452 ../plug-ins/common/alien-map.c:476 -#: ../plug-ins/common/alien-map.c:500 +#: ../plug-ins/common/alien-map.c:453 ../plug-ins/common/alien-map.c:477 +#: ../plug-ins/common/alien-map.c:501 msgid "Phase angle, range 0-360" msgstr "Угол от 0 до 360" #. Propagate Mode -#: ../plug-ins/common/alien-map.c:514 ../plug-ins/common/hot.c:610 -#: ../plug-ins/common/value-propagate.c:1122 ../plug-ins/common/waves.c:277 +#: ../plug-ins/common/alien-map.c:515 ../plug-ins/common/hot.c:611 +#: ../plug-ins/common/value-propagate.c:1123 ../plug-ins/common/waves.c:278 msgid "Mode" msgstr "Режим" -#: ../plug-ins/common/alien-map.c:518 +#: ../plug-ins/common/alien-map.c:519 msgid "_RGB color model" msgstr "_Цветовая модель RGB" -#: ../plug-ins/common/alien-map.c:519 +#: ../plug-ins/common/alien-map.c:520 msgid "_HSL color model" msgstr "Цветовая _модель HSL" @@ -534,29 +534,29 @@ msgstr "Применить холст" #. ***************************************************** #. radio buttons for choosing LEFT or RIGHT #. ************************************************* -#: ../plug-ins/common/apply-canvas.c:1291 ../plug-ins/common/wind.c:944 +#: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945 #: ../plug-ins/lighting/lighting-ui.c:517 msgid "Direction" msgstr "Направление" -#: ../plug-ins/common/apply-canvas.c:1295 +#: ../plug-ins/common/apply-canvas.c:1296 msgid "_Top-right" msgstr "С_верху справа" -#: ../plug-ins/common/apply-canvas.c:1296 +#: ../plug-ins/common/apply-canvas.c:1297 msgid "Top-_left" msgstr "Сверху с_лева" -#: ../plug-ins/common/apply-canvas.c:1297 +#: ../plug-ins/common/apply-canvas.c:1298 msgid "_Bottom-left" msgstr "С_низу слева" -#: ../plug-ins/common/apply-canvas.c:1298 +#: ../plug-ins/common/apply-canvas.c:1299 msgid "Bottom-_right" msgstr "Снизу с_права" -#: ../plug-ins/common/apply-canvas.c:1323 ../plug-ins/common/bump-map.c:915 -#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractal-trace.c:795 +#: ../plug-ins/common/apply-canvas.c:1324 ../plug-ins/common/bump-map.c:916 +#: ../plug-ins/common/emboss.c:524 ../plug-ins/common/fractal-trace.c:796 #: ../plug-ins/map-object/map-object-ui.c:573 msgid "_Depth:" msgstr "_Глубина:" @@ -578,16 +578,16 @@ msgid "Blinds" msgstr "Жалюзи" #. Orientation toggle box -#: ../plug-ins/common/blinds.c:256 ../plug-ins/common/ripple.c:553 +#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:554 msgid "Orientation" msgstr "Ориентация" -#: ../plug-ins/common/blinds.c:260 ../plug-ins/common/ripple.c:557 +#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:558 #: ../plug-ins/common/tile-small.c:425 ../plug-ins/pagecurl/pagecurl.c:533 msgid "_Horizontal" msgstr "По _горизонтали" -#: ../plug-ins/common/blinds.c:263 ../plug-ins/common/ripple.c:560 +#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:561 #: ../plug-ins/common/tile-small.c:435 ../plug-ins/pagecurl/pagecurl.c:532 msgid "_Vertical" msgstr "По _вертикали" @@ -595,7 +595,7 @@ msgstr "По _вертикали" #. #. * Create the "background" layer to hold the image... #. -#: ../plug-ins/common/blinds.c:277 ../plug-ins/common/compose.c:934 +#: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:934 #: ../plug-ins/common/decompose.c:722 ../plug-ins/common/file-cel.c:361 #: ../plug-ins/common/file-cel.c:364 ../plug-ins/common/file-dicom.c:556 #: ../plug-ins/common/file-gif-load.c:927 @@ -603,7 +603,7 @@ msgstr "По _вертикали" #: ../plug-ins/common/file-pcx.c:417 ../plug-ins/common/file-pix.c:381 #: ../plug-ins/common/file-png.c:851 ../plug-ins/common/file-pnm.c:584 #: ../plug-ins/common/file-raw.c:759 ../plug-ins/common/file-sunras.c:974 -#: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:997 +#: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:998 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:256 ../plug-ins/common/tile.c:266 #: ../plug-ins/file-bmp/bmp-read.c:589 ../plug-ins/file-faxg3/faxg3.c:477 @@ -611,22 +611,22 @@ msgstr "По _вертикали" #: ../plug-ins/file-jpeg/jpeg-load.c:760 #: ../plug-ins/file-psd/psd-image-res-load.c:994 #: ../plug-ins/file-psd/psd-load.c:1525 ../plug-ins/file-sgi/sgi.c:383 -#: ../plug-ins/gfig/gfig-dialog.c:1283 +#: ../plug-ins/gfig/gfig-dialog.c:1284 #: ../plug-ins/gimpressionist/general.c:139 ../plug-ins/twain/twain.c:567 -#: ../plug-ins/win-snap/winsnap.c:1154 +#: ../plug-ins/win-snap/winsnap.c:1155 msgid "Background" msgstr "Фон" -#: ../plug-ins/common/blinds.c:281 ../plug-ins/common/fractal-trace.c:737 -#: ../plug-ins/common/tile-paper.c:383 +#: ../plug-ins/common/blinds.c:282 ../plug-ins/common/fractal-trace.c:738 +#: ../plug-ins/common/tile-paper.c:384 msgid "_Transparent" msgstr "П_розрачный" -#: ../plug-ins/common/blinds.c:307 +#: ../plug-ins/common/blinds.c:308 msgid "_Displacement:" msgstr "_Перемещение:" -#: ../plug-ins/common/blinds.c:319 +#: ../plug-ins/common/blinds.c:320 msgid "_Number of segments:" msgstr "_Число сегментов:" @@ -649,16 +649,16 @@ msgstr "Выборочное Гауссово размывание" #: ../plug-ins/common/edge-dog.c:266 ../plug-ins/common/edge-neon.c:227 #: ../plug-ins/common/edge-sobel.c:211 ../plug-ins/common/photocopy.c:243 #: ../plug-ins/common/pixelize.c:292 ../plug-ins/common/softglow.c:223 -#: ../plug-ins/file-sgi/sgi.c:535 ../plug-ins/file-xjt/xjt.c:1698 +#: ../plug-ins/file-sgi/sgi.c:535 ../plug-ins/file-xjt/xjt.c:1699 #: ../plug-ins/gradient-flare/gradient-flare.c:965 msgid "Cannot operate on indexed color images." msgstr "Невозможно использовать для работы с индексированными изображениями" -#: ../plug-ins/common/blur-gauss-selective.c:270 +#: ../plug-ins/common/blur-gauss-selective.c:271 msgid "_Blur radius:" msgstr "_Радиус размывания:" -#: ../plug-ins/common/blur-gauss-selective.c:280 +#: ../plug-ins/common/blur-gauss-selective.c:281 msgid "_Max. delta:" msgstr "_Предел разницы:" @@ -680,29 +680,29 @@ msgid "Gaussian Blur" msgstr "Гауссово размывание" #. parameter settings -#: ../plug-ins/common/blur-gauss.c:507 +#: ../plug-ins/common/blur-gauss.c:508 msgid "Blur Radius" msgstr "Радиус размывания" -#: ../plug-ins/common/blur-gauss.c:521 ../plug-ins/common/jigsaw.c:2456 -#: ../plug-ins/common/noise-spread.c:381 +#: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457 +#: ../plug-ins/common/noise-spread.c:384 msgid "_Horizontal:" msgstr "По _горизонтали:" -#: ../plug-ins/common/blur-gauss.c:525 ../plug-ins/common/jigsaw.c:2473 -#: ../plug-ins/common/noise-spread.c:385 +#: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474 +#: ../plug-ins/common/noise-spread.c:388 msgid "_Vertical:" msgstr "По _вертикали:" -#: ../plug-ins/common/blur-gauss.c:548 +#: ../plug-ins/common/blur-gauss.c:549 msgid "Blur Method" msgstr "Тип размывания" -#: ../plug-ins/common/blur-gauss.c:552 +#: ../plug-ins/common/blur-gauss.c:553 msgid "_IIR" msgstr "_IIR" -#: ../plug-ins/common/blur-gauss.c:553 +#: ../plug-ins/common/blur-gauss.c:554 msgid "_RLE" msgstr "_RLE" @@ -722,59 +722,59 @@ msgstr "Размывание движением" msgid "Motion Blur" msgstr "Размывание движением" -#: ../plug-ins/common/blur-motion.c:1044 +#: ../plug-ins/common/blur-motion.c:1045 msgid "Blur Type" msgstr "Тип размывания" -#: ../plug-ins/common/blur-motion.c:1048 +#: ../plug-ins/common/blur-motion.c:1049 msgctxt "blur-type" msgid "_Linear" msgstr "_Линейное" -#: ../plug-ins/common/blur-motion.c:1049 +#: ../plug-ins/common/blur-motion.c:1050 msgctxt "blur-type" msgid "_Radial" msgstr "_Радиальное" -#: ../plug-ins/common/blur-motion.c:1050 +#: ../plug-ins/common/blur-motion.c:1051 msgctxt "blur-type" msgid "_Zoom" msgstr "_Наезд камерой" -#: ../plug-ins/common/blur-motion.c:1057 +#: ../plug-ins/common/blur-motion.c:1058 msgid "Blur Center" msgstr "Центр размывания" -#: ../plug-ins/common/blur-motion.c:1093 ../plug-ins/common/lens-flare.c:771 -#: ../plug-ins/common/nova.c:462 ../plug-ins/common/tile-paper.c:281 +#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:772 +#: ../plug-ins/common/nova.c:463 ../plug-ins/common/tile-paper.c:282 #: ../plug-ins/flame/flame.c:1250 #: ../plug-ins/gradient-flare/gradient-flare.c:2724 #: ../plug-ins/lighting/lighting-ui.c:476 msgid "_X:" msgstr "_X:" -#: ../plug-ins/common/blur-motion.c:1098 ../plug-ins/common/lens-flare.c:776 -#: ../plug-ins/common/nova.c:467 ../plug-ins/common/tile-paper.c:290 +#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:777 +#: ../plug-ins/common/nova.c:468 ../plug-ins/common/tile-paper.c:291 #: ../plug-ins/flame/flame.c:1264 #: ../plug-ins/gradient-flare/gradient-flare.c:2728 #: ../plug-ins/lighting/lighting-ui.c:491 msgid "_Y:" msgstr "_Y:" -#: ../plug-ins/common/blur-motion.c:1100 +#: ../plug-ins/common/blur-motion.c:1101 msgid "Blur _outward" msgstr "Размыть _наружу" -#: ../plug-ins/common/blur-motion.c:1113 +#: ../plug-ins/common/blur-motion.c:1114 msgid "Blur Parameters" msgstr "Параметры размывания" -#: ../plug-ins/common/blur-motion.c:1124 +#: ../plug-ins/common/blur-motion.c:1125 #: ../plug-ins/map-object/map-object-ui.c:1252 msgid "L_ength:" msgstr "_Длина:" -#: ../plug-ins/common/blur-motion.c:1137 ../plug-ins/common/newsprint.c:1000 +#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:1000 msgid "_Angle:" msgstr "_Угол:" @@ -808,21 +808,21 @@ msgstr "Поиск среднего значения цвета" msgid "Borderaverage" msgstr "Средний цвет рамки" -#: ../plug-ins/common/border-average.c:371 +#: ../plug-ins/common/border-average.c:372 msgid "Border Size" msgstr "Размер рамки" -#: ../plug-ins/common/border-average.c:379 +#: ../plug-ins/common/border-average.c:380 msgid "_Thickness:" msgstr "_Толщина:" #. Number of Colors frame -#: ../plug-ins/common/border-average.c:414 +#: ../plug-ins/common/border-average.c:415 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:907 msgid "Number of Colors" msgstr "Число цветов" -#: ../plug-ins/common/border-average.c:422 +#: ../plug-ins/common/border-average.c:423 msgid "_Bucket size:" msgstr "_Количество цветов:" @@ -842,58 +842,58 @@ msgstr "Создание рельефа" msgid "Bump Map" msgstr "Рельеф" -#: ../plug-ins/common/bump-map.c:831 +#: ../plug-ins/common/bump-map.c:832 msgid "_Bump map:" msgstr "_Карта рельефа:" #. Map type menu -#: ../plug-ins/common/bump-map.c:834 ../plug-ins/flame/flame.c:747 +#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:747 #: ../plug-ins/lighting/lighting-ui.c:841 msgid "Linear" msgstr "Линейный" -#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:749 +#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:749 #: ../plug-ins/lighting/lighting-ui.c:844 msgid "Spherical" msgstr "Сферический" -#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:748 +#: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:748 #: ../plug-ins/lighting/lighting-ui.c:843 msgid "Sinusoidal" msgstr "Синусоидальный" -#: ../plug-ins/common/bump-map.c:843 +#: ../plug-ins/common/bump-map.c:844 msgid "_Map type:" msgstr "_Тип карты:" #. Compensate darkening -#: ../plug-ins/common/bump-map.c:848 +#: ../plug-ins/common/bump-map.c:849 msgid "Co_mpensate for darkening" msgstr "Ко_мпенсировать затемнение" #. Invert bumpmap -#: ../plug-ins/common/bump-map.c:862 +#: ../plug-ins/common/bump-map.c:863 msgid "I_nvert bumpmap" msgstr "_Инвертировать рельеф" #. Tile bumpmap -#: ../plug-ins/common/bump-map.c:876 +#: ../plug-ins/common/bump-map.c:877 msgid "_Tile bumpmap" msgstr "_Повторяющийся рельеф" -#: ../plug-ins/common/bump-map.c:891 ../plug-ins/common/emboss.c:499 +#: ../plug-ins/common/bump-map.c:892 ../plug-ins/common/emboss.c:500 msgid "_Azimuth:" msgstr "_Азимут:" -#: ../plug-ins/common/bump-map.c:903 +#: ../plug-ins/common/bump-map.c:904 msgid "_Elevation:" msgstr "_Возвышение:" -#: ../plug-ins/common/bump-map.c:929 ../plug-ins/common/file-ps.c:3394 +#: ../plug-ins/common/bump-map.c:930 ../plug-ins/common/file-ps.c:3394 msgid "_X offset:" msgstr "_Смещение по X:" -#: ../plug-ins/common/bump-map.c:932 ../plug-ins/common/bump-map.c:946 +#: ../plug-ins/common/bump-map.c:933 ../plug-ins/common/bump-map.c:947 msgid "" "The offset can be adjusted by dragging the preview using the middle mouse " "button." @@ -901,15 +901,15 @@ msgstr "" "Смещение можно установить при помощи средней кнопки мыши, перемещая " "изображение предварительного просмотра." -#: ../plug-ins/common/bump-map.c:943 ../plug-ins/common/file-ps.c:3403 +#: ../plug-ins/common/bump-map.c:944 ../plug-ins/common/file-ps.c:3403 msgid "_Y offset:" msgstr "См_ещение по Y:" -#: ../plug-ins/common/bump-map.c:957 +#: ../plug-ins/common/bump-map.c:958 msgid "_Waterlevel:" msgstr "Ватер_линия:" -#: ../plug-ins/common/bump-map.c:969 +#: ../plug-ins/common/bump-map.c:970 msgid "A_mbient:" msgstr "Осве_щение:" @@ -925,11 +925,11 @@ msgstr "_Комикс..." msgid "Cartoon" msgstr "Комикс" -#: ../plug-ins/common/cartoon.c:847 ../plug-ins/common/photocopy.c:875 +#: ../plug-ins/common/cartoon.c:848 ../plug-ins/common/photocopy.c:876 msgid "_Mask radius:" msgstr "_Радиус маски:" -#: ../plug-ins/common/cartoon.c:861 +#: ../plug-ins/common/cartoon.c:862 msgid "_Percent black:" msgstr "_Процент чёрного:" @@ -949,66 +949,66 @@ msgstr "_Микшер каналов..." msgid "Channel Mixer" msgstr "Микшер каналов" -#: ../plug-ins/common/channel-mixer.c:528 +#: ../plug-ins/common/channel-mixer.c:529 msgid "O_utput channel:" msgstr "К_анал вывода:" #. Redmode radio frame -#: ../plug-ins/common/channel-mixer.c:537 ../plug-ins/common/decompose.c:173 +#: ../plug-ins/common/channel-mixer.c:538 ../plug-ins/common/decompose.c:173 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:990 msgid "Red" msgstr "Красный" #. Greenmode radio frame -#: ../plug-ins/common/channel-mixer.c:542 ../plug-ins/common/decompose.c:174 +#: ../plug-ins/common/channel-mixer.c:543 ../plug-ins/common/decompose.c:174 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1031 msgid "Green" msgstr "Зеленый" #. Bluemode radio frame -#: ../plug-ins/common/channel-mixer.c:547 ../plug-ins/common/decompose.c:175 +#: ../plug-ins/common/channel-mixer.c:548 ../plug-ins/common/decompose.c:175 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1072 msgid "Blue" msgstr "Синий" -#: ../plug-ins/common/channel-mixer.c:582 -#: ../plug-ins/common/color-exchange.c:397 ../plug-ins/common/compose.c:189 +#: ../plug-ins/common/channel-mixer.c:583 +#: ../plug-ins/common/color-exchange.c:398 ../plug-ins/common/compose.c:189 #: ../plug-ins/common/compose.c:200 ../plug-ins/common/diffraction.c:500 #: ../plug-ins/common/diffraction.c:538 ../plug-ins/common/diffraction.c:576 -#: ../plug-ins/common/noise-rgb.c:531 ../plug-ins/common/noise-rgb.c:538 +#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539 msgid "_Red:" msgstr "_Красный:" -#: ../plug-ins/common/channel-mixer.c:600 -#: ../plug-ins/common/color-exchange.c:457 ../plug-ins/common/compose.c:190 +#: ../plug-ins/common/channel-mixer.c:601 +#: ../plug-ins/common/color-exchange.c:458 ../plug-ins/common/compose.c:190 #: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:509 #: ../plug-ins/common/diffraction.c:547 ../plug-ins/common/diffraction.c:585 -#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539 +#: ../plug-ins/common/noise-rgb.c:533 ../plug-ins/common/noise-rgb.c:540 msgid "_Green:" msgstr "_Зеленый:" -#: ../plug-ins/common/channel-mixer.c:619 -#: ../plug-ins/common/color-exchange.c:518 ../plug-ins/common/compose.c:191 +#: ../plug-ins/common/channel-mixer.c:620 +#: ../plug-ins/common/color-exchange.c:519 ../plug-ins/common/compose.c:191 #: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:518 #: ../plug-ins/common/diffraction.c:556 ../plug-ins/common/diffraction.c:594 -#: ../plug-ins/common/noise-rgb.c:533 ../plug-ins/common/noise-rgb.c:540 +#: ../plug-ins/common/noise-rgb.c:534 ../plug-ins/common/noise-rgb.c:541 msgid "_Blue:" msgstr "С_иний:" -#: ../plug-ins/common/channel-mixer.c:635 +#: ../plug-ins/common/channel-mixer.c:636 msgid "_Monochrome" msgstr "_Монохромный" -#: ../plug-ins/common/channel-mixer.c:648 +#: ../plug-ins/common/channel-mixer.c:649 msgid "Preserve _luminosity" msgstr "Сохранять _яркость" -#: ../plug-ins/common/channel-mixer.c:877 +#: ../plug-ins/common/channel-mixer.c:878 msgid "Load Channel Mixer Settings" msgstr "Загрузить установки микшера каналов" #. stat error (file does not exist) -#: ../plug-ins/common/channel-mixer.c:981 +#: ../plug-ins/common/channel-mixer.c:982 #: ../plug-ins/common/cml-explorer.c:2177 ../plug-ins/common/curve-bend.c:884 #: ../plug-ins/common/file-cel.c:311 ../plug-ins/common/file-compressor.c:497 #: ../plug-ins/common/file-compressor.c:665 @@ -1020,12 +1020,12 @@ msgstr "Загрузить установки микшера каналов" #: ../plug-ins/common/file-pdf.c:550 ../plug-ins/common/file-pix.c:342 #: ../plug-ins/common/file-png.c:720 ../plug-ins/common/file-pnm.c:493 #: ../plug-ins/common/file-ps.c:1037 ../plug-ins/common/file-ps.c:3044 -#: ../plug-ins/common/file-psp.c:1750 ../plug-ins/common/file-raw.c:253 +#: ../plug-ins/common/file-psp.c:1717 ../plug-ins/common/file-raw.c:253 #: ../plug-ins/common/file-raw.c:707 ../plug-ins/common/file-sunras.c:390 #: ../plug-ins/common/file-svg.c:332 ../plug-ins/common/file-svg.c:717 #: ../plug-ins/common/file-tga.c:441 ../plug-ins/common/file-tiff-load.c:291 -#: ../plug-ins/common/file-xbm.c:736 ../plug-ins/common/file-xmc.c:665 -#: ../plug-ins/common/file-xmc.c:852 ../plug-ins/common/file-xwd.c:432 +#: ../plug-ins/common/file-xbm.c:736 ../plug-ins/common/file-xmc.c:666 +#: ../plug-ins/common/file-xmc.c:853 ../plug-ins/common/file-xwd.c:432 #: ../plug-ins/common/sphere-designer.c:2001 #: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:232 #: ../plug-ins/file-fits/fits.c:357 ../plug-ins/file-fli/fli-gimp.c:459 @@ -1034,7 +1034,7 @@ msgstr "Загрузить установки микшера каналов" #: ../plug-ins/file-jpeg/jpeg-load.c:830 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:189 -#: ../plug-ins/file-xjt/xjt.c:2540 ../plug-ins/file-xjt/xjt.c:2548 +#: ../plug-ins/file-xjt/xjt.c:2541 ../plug-ins/file-xjt/xjt.c:2549 #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1862 #: ../plug-ins/fractal-explorer/fractal-explorer.c:928 @@ -1045,11 +1045,11 @@ msgstr "Загрузить установки микшера каналов" msgid "Could not open '%s' for reading: %s" msgstr "Не удалось открыть '%s' для записи: %s" -#: ../plug-ins/common/channel-mixer.c:1004 +#: ../plug-ins/common/channel-mixer.c:1005 msgid "Save Channel Mixer Settings" msgstr "Сохранить установки микшера каналов" -#: ../plug-ins/common/channel-mixer.c:1059 +#: ../plug-ins/common/channel-mixer.c:1060 #: ../plug-ins/common/cml-explorer.c:2004 ../plug-ins/common/curve-bend.c:832 #: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-compressor.c:425 #: ../plug-ins/common/file-compressor.c:507 @@ -1057,7 +1057,7 @@ msgstr "Сохранить установки микшера каналов" #: ../plug-ins/common/file-compressor.c:676 #: ../plug-ins/common/file-csource.c:405 ../plug-ins/common/file-dicom.c:800 #: ../plug-ins/common/file-gbr.c:634 ../plug-ins/common/file-gif-save.c:761 -#: ../plug-ins/common/file-gih.c:1276 ../plug-ins/common/file-html-table.c:235 +#: ../plug-ins/common/file-gih.c:1277 ../plug-ins/common/file-html-table.c:235 #: ../plug-ins/common/file-mng.c:574 ../plug-ins/common/file-mng.c:908 #: ../plug-ins/common/file-pat.c:461 ../plug-ins/common/file-pcx.c:665 #: ../plug-ins/common/file-pix.c:523 ../plug-ins/common/file-png.c:1269 @@ -1065,13 +1065,13 @@ msgstr "Сохранить установки микшера каналов" #: ../plug-ins/common/file-raw.c:587 ../plug-ins/common/file-raw.c:615 #: ../plug-ins/common/file-sunras.c:562 ../plug-ins/common/file-tga.c:1169 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034 -#: ../plug-ins/common/file-xmc.c:1474 ../plug-ins/common/file-xwd.c:613 +#: ../plug-ins/common/file-xmc.c:1475 ../plug-ins/common/file-xwd.c:613 #: ../plug-ins/common/sphere-designer.c:2111 #: ../plug-ins/file-bmp/bmp-write.c:295 ../plug-ins/file-fits/fits.c:475 #: ../plug-ins/file-fli/fli-gimp.c:749 ../plug-ins/file-ico/ico-save.c:1007 #: ../plug-ins/file-jpeg/jpeg-save.c:329 ../plug-ins/file-psd/psd-save.c:1637 #: ../plug-ins/file-uri/uri-backend-libcurl.c:162 -#: ../plug-ins/file-xjt/xjt.c:1291 ../plug-ins/file-xjt/xjt.c:1726 +#: ../plug-ins/file-xjt/xjt.c:1292 ../plug-ins/file-xjt/xjt.c:1727 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545 #: ../plug-ins/gfig/gfig.c:793 ../plug-ins/ifs-compose/ifs-compose.c:2374 @@ -1080,7 +1080,7 @@ msgstr "Сохранить установки микшера каналов" msgid "Could not open '%s' for writing: %s" msgstr "Не удалось открыть '%s' для записи: %s" -#: ../plug-ins/common/channel-mixer.c:1067 +#: ../plug-ins/common/channel-mixer.c:1068 #: ../plug-ins/common/cml-explorer.c:2059 #, c-format msgid "Parameters were saved to '%s'" @@ -1102,12 +1102,12 @@ msgstr "Создание шахматной доски" msgid "Checkerboard" msgstr "Шахматная доска" -#: ../plug-ins/common/checkerboard.c:411 ../plug-ins/common/file-xmc.c:1181 -#: ../plug-ins/gimpressionist/sizemap.c:510 +#: ../plug-ins/common/checkerboard.c:412 ../plug-ins/common/file-xmc.c:1182 +#: ../plug-ins/gimpressionist/sizemap.c:511 msgid "_Size:" msgstr "_Размер:" -#: ../plug-ins/common/checkerboard.c:420 +#: ../plug-ins/common/checkerboard.c:421 msgid "_Psychobilly" msgstr "_Психоделия" @@ -1351,7 +1351,7 @@ msgid "Random Seed" msgstr "Случайное зерно" #: ../plug-ins/common/cml-explorer.c:1287 ../plug-ins/common/filter-pack.c:699 -#: ../plug-ins/common/van-gogh-lic.c:670 +#: ../plug-ins/common/van-gogh-lic.c:671 msgid "_Hue" msgstr "_Тон" @@ -1599,39 +1599,39 @@ msgstr "_Замена цвета..." msgid "Color Exchange" msgstr "Замена цвета" -#: ../plug-ins/common/color-exchange.c:308 +#: ../plug-ins/common/color-exchange.c:309 msgid "Middle-Click Inside Preview to Pick \"From Color\"" msgstr "Нажмите средней кнопкой мыши внутри для выбора «С цвета»" -#: ../plug-ins/common/color-exchange.c:346 +#: ../plug-ins/common/color-exchange.c:347 msgid "To Color" msgstr "На цвет" -#: ../plug-ins/common/color-exchange.c:346 +#: ../plug-ins/common/color-exchange.c:347 msgid "From Color" msgstr "С цвета" -#: ../plug-ins/common/color-exchange.c:364 +#: ../plug-ins/common/color-exchange.c:365 msgid "Color Exchange: To Color" msgstr "Замена цвета: На цвет" -#: ../plug-ins/common/color-exchange.c:365 +#: ../plug-ins/common/color-exchange.c:366 msgid "Color Exchange: From Color" msgstr "Замена цвета: С цвета" -#: ../plug-ins/common/color-exchange.c:423 +#: ../plug-ins/common/color-exchange.c:424 msgid "R_ed threshold:" msgstr "Порог _красного:" -#: ../plug-ins/common/color-exchange.c:483 +#: ../plug-ins/common/color-exchange.c:484 msgid "G_reen threshold:" msgstr "Порог _зелёного:" -#: ../plug-ins/common/color-exchange.c:544 +#: ../plug-ins/common/color-exchange.c:545 msgid "B_lue threshold:" msgstr "Порог _синего:" -#: ../plug-ins/common/color-exchange.c:572 +#: ../plug-ins/common/color-exchange.c:573 msgid "Lock _thresholds" msgstr "За_фиксировать пороги" @@ -1651,11 +1651,11 @@ msgstr "Удаление цвета" msgid "Color to Alpha" msgstr "Цвет в альфа-канал" -#: ../plug-ins/common/color-to-alpha.c:413 +#: ../plug-ins/common/color-to-alpha.c:414 msgid "Color to Alpha Color Picker" msgstr "Выбор цвета в альфа-канале" -#: ../plug-ins/common/color-to-alpha.c:428 +#: ../plug-ins/common/color-to-alpha.c:429 msgid "to alpha" msgstr "в альфа-канал" @@ -1675,11 +1675,11 @@ msgstr "Окрашивание" msgid "Colorify" msgstr "Окрашивание" -#: ../plug-ins/common/colorify.c:288 +#: ../plug-ins/common/colorify.c:289 msgid "Custom color:" msgstr "Выбор цвета:" -#: ../plug-ins/common/colorify.c:293 +#: ../plug-ins/common/colorify.c:294 msgid "Colorify Custom Color" msgstr "Окрашивание выбранным цветом" @@ -1733,7 +1733,7 @@ msgstr "Сбросить порядок" msgid "Rearrange Colormap" msgstr "Перестроить цветовую карту" -#: ../plug-ins/common/colormap-remap.c:698 +#: ../plug-ins/common/colormap-remap.c:699 msgid "" "Drag and drop colors to rearrange the colormap. The numbers shown are the " "original indices. Right-click for a menu with sort options." @@ -1743,7 +1743,7 @@ msgstr "" "правой кнопкой мыши." #: ../plug-ins/common/compose.c:188 ../plug-ins/common/decompose.c:169 -#: ../plug-ins/common/file-raw.c:1095 +#: ../plug-ins/common/file-raw.c:1096 msgid "RGB" msgstr "RGB" @@ -1751,8 +1751,8 @@ msgstr "RGB" msgid "RGBA" msgstr "RGBA" -#: ../plug-ins/common/compose.c:203 ../plug-ins/common/noise-rgb.c:526 -#: ../plug-ins/common/noise-rgb.c:541 +#: ../plug-ins/common/compose.c:203 ../plug-ins/common/noise-rgb.c:527 +#: ../plug-ins/common/noise-rgb.c:542 msgid "_Alpha:" msgstr "Альфа:" @@ -1765,11 +1765,11 @@ msgid "_Hue:" msgstr "_Тон:" #: ../plug-ins/common/compose.c:212 ../plug-ins/common/compose.c:220 -#: ../plug-ins/common/noise-hsv.c:423 +#: ../plug-ins/common/noise-hsv.c:424 msgid "_Saturation:" msgstr "Насыщенность:" -#: ../plug-ins/common/compose.c:213 ../plug-ins/common/noise-hsv.c:435 +#: ../plug-ins/common/compose.c:213 ../plug-ins/common/noise-hsv.c:436 msgid "_Value:" msgstr "Яркость:" @@ -1896,7 +1896,7 @@ msgstr "Не удалось получить слои изображения %d" msgid "Composing" msgstr "Сборка" -#: ../plug-ins/common/compose.c:696 ../plug-ins/common/compose.c:1734 +#: ../plug-ins/common/compose.c:696 ../plug-ins/common/compose.c:1735 msgid "At least one image is needed to compose" msgstr "Для сборки необходимо по крайней мере одно изображение" @@ -1931,20 +1931,20 @@ msgid "Compose" msgstr "Собрать" #. Compose type combo -#: ../plug-ins/common/compose.c:1514 +#: ../plug-ins/common/compose.c:1515 msgid "Compose Channels" msgstr "Собрать каналы" -#: ../plug-ins/common/compose.c:1524 ../plug-ins/common/decompose.c:1514 +#: ../plug-ins/common/compose.c:1525 ../plug-ins/common/decompose.c:1514 msgid "Color _model:" msgstr "Цветовая _модель:" #. Channel representation table -#: ../plug-ins/common/compose.c:1556 +#: ../plug-ins/common/compose.c:1557 msgid "Channel Representations" msgstr "Представление канала" -#: ../plug-ins/common/compose.c:1619 +#: ../plug-ins/common/compose.c:1620 msgid "Mask value" msgstr "Значение маски" @@ -1953,7 +1953,7 @@ msgid "Stretch brightness values to cover the full range" msgstr "Предельно растянуть значения яркости" #: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:358 +#: ../plug-ins/common/edge-dog.c:359 msgid "_Normalize" msgstr "_Упорядочить" @@ -1977,35 +1977,35 @@ msgstr "Ретинекс" msgid "Retinex Image Enhancement" msgstr "Улучшение изображения при помощи ретинекса" -#: ../plug-ins/common/contrast-retinex.c:320 +#: ../plug-ins/common/contrast-retinex.c:321 msgid "Uniform" msgstr "Равномерный" -#: ../plug-ins/common/contrast-retinex.c:321 +#: ../plug-ins/common/contrast-retinex.c:322 msgid "Low" msgstr "Низкий" -#: ../plug-ins/common/contrast-retinex.c:322 +#: ../plug-ins/common/contrast-retinex.c:323 msgid "High" msgstr "Высокий" -#: ../plug-ins/common/contrast-retinex.c:333 +#: ../plug-ins/common/contrast-retinex.c:334 msgid "_Level:" msgstr "_Уровень:" -#: ../plug-ins/common/contrast-retinex.c:338 +#: ../plug-ins/common/contrast-retinex.c:339 msgid "_Scale:" msgstr "Масштаб:" -#: ../plug-ins/common/contrast-retinex.c:353 +#: ../plug-ins/common/contrast-retinex.c:354 msgid "Scale _division:" msgstr "Дел_ение:" -#: ../plug-ins/common/contrast-retinex.c:368 +#: ../plug-ins/common/contrast-retinex.c:369 msgid "Dy_namic:" msgstr "Дин_амика:" -#: ../plug-ins/common/contrast-retinex.c:641 +#: ../plug-ins/common/contrast-retinex.c:642 msgid "Retinex: filtering" msgstr "Ретинекс: фильтрование..." @@ -2068,8 +2068,8 @@ msgid "E_xtend" msgstr "_Расширить" #: ../plug-ins/common/convolution-matrix.c:73 -#: ../plug-ins/common/displace.c:471 ../plug-ins/common/edge.c:704 -#: ../plug-ins/common/fractal-trace.c:735 ../plug-ins/common/ripple.c:581 +#: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:705 +#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:582 msgid "_Wrap" msgstr "З_авернуть" @@ -2097,32 +2097,32 @@ msgstr "Применение свертки" msgid "Convolution Matrix" msgstr "Матрица свёртки" -#: ../plug-ins/common/convolution-matrix.c:943 +#: ../plug-ins/common/convolution-matrix.c:944 msgid "Matrix" msgstr "Матрица" -#: ../plug-ins/common/convolution-matrix.c:981 +#: ../plug-ins/common/convolution-matrix.c:982 msgid "D_ivisor:" msgstr "Делитель:" -#: ../plug-ins/common/convolution-matrix.c:1007 -#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1116 +#: ../plug-ins/common/convolution-matrix.c:1008 +#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1117 msgid "O_ffset:" msgstr "Смещение:" -#: ../plug-ins/common/convolution-matrix.c:1036 +#: ../plug-ins/common/convolution-matrix.c:1037 msgid "N_ormalise" msgstr "Н_ормализовать" -#: ../plug-ins/common/convolution-matrix.c:1048 +#: ../plug-ins/common/convolution-matrix.c:1049 msgid "A_lpha-weighting" msgstr "А_льфа-нагрузка" -#: ../plug-ins/common/convolution-matrix.c:1067 +#: ../plug-ins/common/convolution-matrix.c:1068 msgid "Border" msgstr "Рамка" -#: ../plug-ins/common/convolution-matrix.c:1094 +#: ../plug-ins/common/convolution-matrix.c:1095 msgid "Channels" msgstr "Каналы" @@ -2175,19 +2175,19 @@ msgstr "К_убизм..." msgid "Cubism" msgstr "Кубизм" -#: ../plug-ins/common/cubism.c:304 +#: ../plug-ins/common/cubism.c:305 msgid "_Tile size:" msgstr "_Размер элемента:" -#: ../plug-ins/common/cubism.c:317 +#: ../plug-ins/common/cubism.c:318 msgid "T_ile saturation:" msgstr "_Насыщенность элемента:" -#: ../plug-ins/common/cubism.c:328 +#: ../plug-ins/common/cubism.c:329 msgid "_Use background color" msgstr "_Использовать цвет фона" -#: ../plug-ins/common/cubism.c:418 +#: ../plug-ins/common/cubism.c:419 msgid "Cubistic transformation" msgstr "Кубистическое преобразование" @@ -2219,130 +2219,130 @@ msgstr "Ошибка при чтении '%s'. %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1216 ../plug-ins/common/curve-bend.c:2937 +#: ../plug-ins/common/curve-bend.c:1216 ../plug-ins/common/curve-bend.c:2938 msgid "Curve Bend" msgstr "Изгиб по кривой" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1252 +#: ../plug-ins/common/curve-bend.c:1253 #: ../plug-ins/gimpressionist/orientmap.c:591 -#: ../plug-ins/gimpressionist/sizemap.c:460 +#: ../plug-ins/gimpressionist/sizemap.c:461 #: ../plug-ins/print/print-page-layout.c:171 msgid "Preview" msgstr "Просмотр" #. The preview button -#: ../plug-ins/common/curve-bend.c:1281 +#: ../plug-ins/common/curve-bend.c:1282 msgid "_Preview Once" msgstr "_Просмотреть" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1290 +#: ../plug-ins/common/curve-bend.c:1291 msgid "Automatic pre_view" msgstr "_Автообновление просмотра" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1300 ../plug-ins/common/ripple.c:519 +#: ../plug-ins/common/curve-bend.c:1301 ../plug-ins/common/ripple.c:520 #: ../plug-ins/gfig/gfig-dialog.c:1206 msgid "Options" msgstr "Параметры" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1314 +#: ../plug-ins/common/curve-bend.c:1315 msgid "Rotat_e:" msgstr "_Вращение:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1333 +#: ../plug-ins/common/curve-bend.c:1334 msgid "Smoo_thing" msgstr "С_глаживание изображения" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1343 ../plug-ins/common/mosaic.c:730 -#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:528 +#: ../plug-ins/common/curve-bend.c:1344 ../plug-ins/common/mosaic.c:731 +#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:529 msgid "_Antialiasing" msgstr "Сглаживание _края" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1353 +#: ../plug-ins/common/curve-bend.c:1354 msgid "Work on cop_y" msgstr "_Работать с копией" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1364 msgid "Modify Curves" msgstr "Корректирующие кривые" -#: ../plug-ins/common/curve-bend.c:1391 +#: ../plug-ins/common/curve-bend.c:1392 msgid "Curve for Border" msgstr "Кривая для края:" -#: ../plug-ins/common/curve-bend.c:1395 +#: ../plug-ins/common/curve-bend.c:1396 msgid "_Upper" msgstr "В_ерхнего" -#: ../plug-ins/common/curve-bend.c:1396 +#: ../plug-ins/common/curve-bend.c:1397 msgid "_Lower" msgstr "_Нижнего" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1407 msgid "Curve Type" msgstr "Тип кривой:" -#: ../plug-ins/common/curve-bend.c:1410 +#: ../plug-ins/common/curve-bend.c:1411 msgid "Smoot_h" msgstr "Гл_адкая" -#: ../plug-ins/common/curve-bend.c:1411 +#: ../plug-ins/common/curve-bend.c:1412 msgid "_Free" msgstr "_Свободная" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1426 +#: ../plug-ins/common/curve-bend.c:1427 msgid "_Copy" msgstr "Ско_пировать" -#: ../plug-ins/common/curve-bend.c:1431 +#: ../plug-ins/common/curve-bend.c:1432 msgid "Copy the active curve to the other border" msgstr "Скопировать активную кривую на другой край" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1438 +#: ../plug-ins/common/curve-bend.c:1439 msgid "_Mirror" msgstr "Отра_зить" -#: ../plug-ins/common/curve-bend.c:1443 +#: ../plug-ins/common/curve-bend.c:1444 msgid "Mirror the active curve to the other border" msgstr "Зеркально отразить активную кривую на другой край" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1451 +#: ../plug-ins/common/curve-bend.c:1452 msgid "S_wap" msgstr "Перестав_ить" -#: ../plug-ins/common/curve-bend.c:1456 +#: ../plug-ins/common/curve-bend.c:1457 msgid "Swap the two curves" msgstr "Переставить две кривые" -#: ../plug-ins/common/curve-bend.c:1468 +#: ../plug-ins/common/curve-bend.c:1469 msgid "Reset the active curve" msgstr "Сбросить активную кривую" -#: ../plug-ins/common/curve-bend.c:1485 +#: ../plug-ins/common/curve-bend.c:1486 msgid "Load the curves from a file" msgstr "Загрузить кривые из файла" -#: ../plug-ins/common/curve-bend.c:1497 +#: ../plug-ins/common/curve-bend.c:1498 msgid "Save the curves to a file" msgstr "Сохранить кривые в файле" -#: ../plug-ins/common/curve-bend.c:2035 +#: ../plug-ins/common/curve-bend.c:2036 msgid "Load Curve Points from File" msgstr "Загрузить точки кривой из файла" -#: ../plug-ins/common/curve-bend.c:2070 +#: ../plug-ins/common/curve-bend.c:2071 msgid "Save Curve Points to File" msgstr "Сохранить точки кривой в файле" @@ -2554,11 +2554,11 @@ msgstr "_Убрать черезстрочность..." msgid "Deinterlace" msgstr "Убрать черезстрочность" -#: ../plug-ins/common/deinterlace.c:353 +#: ../plug-ins/common/deinterlace.c:354 msgid "Keep o_dd fields" msgstr "Сохранить нечетные поля" -#: ../plug-ins/common/deinterlace.c:354 +#: ../plug-ins/common/deinterlace.c:355 msgid "Keep _even fields" msgstr "Сохранить четные поля" @@ -2610,35 +2610,35 @@ msgstr "Удалить из изображения шум, создаваемы msgid "Des_peckle..." msgstr "Удаление _пятен..." -#: ../plug-ins/common/despeckle.c:424 ../plug-ins/common/despeckle.c:644 +#: ../plug-ins/common/despeckle.c:424 ../plug-ins/common/despeckle.c:645 msgid "Despeckle" msgstr "Удаление пятен" -#: ../plug-ins/common/despeckle.c:453 +#: ../plug-ins/common/despeckle.c:454 msgid "Median" msgstr "Среднее" -#: ../plug-ins/common/despeckle.c:461 +#: ../plug-ins/common/despeckle.c:462 msgid "_Adaptive" msgstr "_Адаптивное" -#: ../plug-ins/common/despeckle.c:471 +#: ../plug-ins/common/despeckle.c:472 msgid "R_ecursive" msgstr "_Рекурсивное" -#: ../plug-ins/common/despeckle.c:492 ../plug-ins/common/edge-neon.c:731 -#: ../plug-ins/common/nl-filter.c:1089 ../plug-ins/common/nova.c:365 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:588 +#: ../plug-ins/common/despeckle.c:493 ../plug-ins/common/edge-neon.c:732 +#: ../plug-ins/common/nl-filter.c:1090 ../plug-ins/common/nova.c:366 +#: ../plug-ins/common/unsharp-mask.c:866 ../plug-ins/common/whirl-pinch.c:589 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" msgstr "_Радиус:" -#: ../plug-ins/common/despeckle.c:508 +#: ../plug-ins/common/despeckle.c:509 msgid "_Black level:" msgstr "Уровень _черного:" -#: ../plug-ins/common/despeckle.c:524 +#: ../plug-ins/common/despeckle.c:525 msgid "_White level:" msgstr "Уровень _белого:" @@ -2658,17 +2658,17 @@ msgstr "Удаление штрихов" msgid "Destripe" msgstr "Удаление штрихов" -#: ../plug-ins/common/destripe.c:472 ../plug-ins/common/file-html-table.c:594 +#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:594 #: ../plug-ins/common/file-ps.c:3167 ../plug-ins/common/file-ps.c:3376 -#: ../plug-ins/common/file-raw.c:1129 ../plug-ins/common/smooth-palette.c:435 -#: ../plug-ins/common/tile-paper.c:301 ../plug-ins/common/tile.c:430 +#: ../plug-ins/common/file-raw.c:1130 ../plug-ins/common/smooth-palette.c:435 +#: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:402 #: ../plug-ins/print/print-page-layout.c:264 msgid "_Width:" msgstr "_Ширина:" -#: ../plug-ins/common/destripe.c:483 +#: ../plug-ins/common/destripe.c:484 msgid "Create _histogram" msgstr "Создать _гистограмму" @@ -2705,7 +2705,7 @@ msgstr "Контуры" msgid "Sharp Edges" msgstr "Резкие края" -#: ../plug-ins/common/diffraction.c:614 ../plug-ins/common/softglow.c:682 +#: ../plug-ins/common/diffraction.c:614 ../plug-ins/common/softglow.c:683 #: ../plug-ins/flame/flame.c:1080 msgid "_Brightness:" msgstr "_Яркость:" @@ -2755,38 +2755,38 @@ msgid "Displace" msgstr "Смещение" #. X options -#: ../plug-ins/common/displace.c:361 +#: ../plug-ins/common/displace.c:362 msgid "_X displacement:" msgstr "Смещение по _Х:" #. Y Options -#: ../plug-ins/common/displace.c:408 +#: ../plug-ins/common/displace.c:409 msgid "_Y displacement:" msgstr "Смещение по _Y:" -#: ../plug-ins/common/displace.c:458 +#: ../plug-ins/common/displace.c:459 msgid "Displacement Mode" msgstr "Вид смещения:" -#: ../plug-ins/common/displace.c:461 +#: ../plug-ins/common/displace.c:462 msgid "_Cartesian" msgstr "_Картезианский" -#: ../plug-ins/common/displace.c:462 +#: ../plug-ins/common/displace.c:463 msgid "_Polar" msgstr "_Полярный" -#: ../plug-ins/common/displace.c:467 +#: ../plug-ins/common/displace.c:468 msgid "Edge Behavior" msgstr "Край" -#: ../plug-ins/common/displace.c:473 ../plug-ins/common/edge.c:717 -#: ../plug-ins/common/ripple.c:582 ../plug-ins/common/waves.c:281 +#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:718 +#: ../plug-ins/common/ripple.c:583 ../plug-ins/common/waves.c:282 msgid "_Smear" msgstr "_Размыть" -#: ../plug-ins/common/displace.c:475 ../plug-ins/common/edge.c:730 -#: ../plug-ins/common/fractal-trace.c:739 ../plug-ins/common/newsprint.c:397 +#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:731 +#: ../plug-ins/common/fractal-trace.c:740 ../plug-ins/common/newsprint.c:397 msgid "_Black" msgstr "_Черный" @@ -2802,19 +2802,19 @@ msgstr "_Разница по Гауссу..." msgid "DoG Edge Detect" msgstr "Выделение края" -#: ../plug-ins/common/edge-dog.c:328 +#: ../plug-ins/common/edge-dog.c:329 msgid "Smoothing Parameters" msgstr "Параметры сглаживания" -#: ../plug-ins/common/edge-dog.c:342 +#: ../plug-ins/common/edge-dog.c:343 msgid "_Radius 1:" msgstr "_Радиус 1:" -#: ../plug-ins/common/edge-dog.c:346 +#: ../plug-ins/common/edge-dog.c:347 msgid "R_adius 2:" msgstr "Р_адиус 2:" -#: ../plug-ins/common/edge-dog.c:369 ../plug-ins/gimpressionist/paper.c:166 +#: ../plug-ins/common/edge-dog.c:370 ../plug-ins/gimpressionist/paper.c:166 msgid "_Invert" msgstr "_Инвертировать" @@ -2826,7 +2826,7 @@ msgstr "Выделение края с высоким разрешением" msgid "_Laplace" msgstr "_Лаплас" -#: ../plug-ins/common/edge-laplace.c:242 ../plug-ins/common/edge.c:668 +#: ../plug-ins/common/edge-laplace.c:242 ../plug-ins/common/edge.c:669 msgid "Laplace" msgstr "Лаплас" @@ -2850,7 +2850,7 @@ msgstr "Неон" msgid "Neon Detection" msgstr "Выделение края — неон" -#: ../plug-ins/common/edge-neon.c:746 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:879 msgid "_Amount:" msgstr "_Величина:" @@ -2866,19 +2866,19 @@ msgstr "_Собел..." msgid "Sobel Edge Detection" msgstr "Выделение края по Sobel" -#: ../plug-ins/common/edge-sobel.c:259 +#: ../plug-ins/common/edge-sobel.c:260 msgid "Sobel _horizontally" msgstr "_Горизонтальное размывание по Sobel" -#: ../plug-ins/common/edge-sobel.c:271 +#: ../plug-ins/common/edge-sobel.c:272 msgid "Sobel _vertically" msgstr "_Вертикальное размывание по Sobel" -#: ../plug-ins/common/edge-sobel.c:283 +#: ../plug-ins/common/edge-sobel.c:284 msgid "_Keep sign of result (one direction only)" msgstr "_Сохранять знак результата (только одно направление)" -#: ../plug-ins/common/edge-sobel.c:369 +#: ../plug-ins/common/edge-sobel.c:370 msgid "Sobel edge detecting" msgstr "Выделение края по Sobel" @@ -2898,31 +2898,31 @@ msgstr "Выделение края" msgid "Edge Detection" msgstr "Выделение края" -#: ../plug-ins/common/edge.c:663 +#: ../plug-ins/common/edge.c:664 msgid "Sobel" msgstr "Собел" -#: ../plug-ins/common/edge.c:664 +#: ../plug-ins/common/edge.c:665 msgid "Prewitt compass" msgstr "По Превитту" -#: ../plug-ins/common/edge.c:665 ../plug-ins/common/sinus.c:903 +#: ../plug-ins/common/edge.c:666 ../plug-ins/common/sinus.c:903 msgid "Gradient" msgstr "Градиент" -#: ../plug-ins/common/edge.c:666 +#: ../plug-ins/common/edge.c:667 msgid "Roberts" msgstr "По Робертсу" -#: ../plug-ins/common/edge.c:667 +#: ../plug-ins/common/edge.c:668 msgid "Differential" msgstr "Дифференциальный" -#: ../plug-ins/common/edge.c:677 +#: ../plug-ins/common/edge.c:678 msgid "_Algorithm:" msgstr "_Алгоритм:" -#: ../plug-ins/common/edge.c:685 +#: ../plug-ins/common/edge.c:686 msgid "A_mount:" msgstr "_Величина:" @@ -2938,19 +2938,19 @@ msgstr "_Барельеф..." msgid "Emboss" msgstr "Барельеф" -#: ../plug-ins/common/emboss.c:474 +#: ../plug-ins/common/emboss.c:475 msgid "Function" msgstr "Функция" -#: ../plug-ins/common/emboss.c:478 +#: ../plug-ins/common/emboss.c:479 msgid "_Bumpmap" msgstr "_Рельеф" -#: ../plug-ins/common/emboss.c:479 +#: ../plug-ins/common/emboss.c:480 msgid "_Emboss" msgstr "_Барельеф" -#: ../plug-ins/common/emboss.c:511 +#: ../plug-ins/common/emboss.c:512 msgid "E_levation:" msgstr "_Возвышение:" @@ -2970,17 +2970,17 @@ msgstr "Гравировка" msgid "Engrave" msgstr "Гравировка" -#: ../plug-ins/common/engrave.c:243 ../plug-ins/common/file-html-table.c:610 +#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:610 #: ../plug-ins/common/file-ps.c:3177 ../plug-ins/common/file-ps.c:3385 -#: ../plug-ins/common/file-raw.c:1142 ../plug-ins/common/film.c:1002 -#: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:312 -#: ../plug-ins/common/tile.c:434 ../plug-ins/imagemap/imap_cmd_guides.c:174 +#: ../plug-ins/common/file-raw.c:1143 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:313 +#: ../plug-ins/common/tile.c:435 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:409 #: ../plug-ins/print/print-page-layout.c:266 msgid "_Height:" msgstr "_Высота:" -#: ../plug-ins/common/engrave.c:254 +#: ../plug-ins/common/engrave.c:255 msgid "_Limit line width" msgstr "_Ограничение ширины линии" @@ -3017,13 +3017,13 @@ msgstr "Загрузка палитры KISS" #: ../plug-ins/common/file-png.c:727 ../plug-ins/common/file-pnm.c:498 #: ../plug-ins/common/file-ps.c:1043 ../plug-ins/common/file-raw.c:712 #: ../plug-ins/common/file-sunras.c:485 ../plug-ins/common/file-tga.c:446 -#: ../plug-ins/common/file-tiff-load.c:603 ../plug-ins/common/file-wmf.c:993 -#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:677 +#: ../plug-ins/common/file-tiff-load.c:604 ../plug-ins/common/file-wmf.c:993 +#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:678 #: ../plug-ins/common/file-xpm.c:351 ../plug-ins/common/file-xwd.c:519 #: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:216 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:645 #: ../plug-ins/file-jpeg/jpeg-load.c:114 ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3343 +#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3344 #, c-format msgid "Opening '%s'" msgstr "Открывается \"%s\"" @@ -3040,18 +3040,18 @@ msgstr "Неподдерживаемое число цветов (%d)!" #. init the progress meter #. And let's begin the progress #: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:639 -#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1281 +#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1282 #: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:466 #: ../plug-ins/common/file-pcx.c:626 ../plug-ins/common/file-pix.c:528 #: ../plug-ins/common/file-png.c:1276 ../plug-ins/common/file-pnm.c:981 #: ../plug-ins/common/file-ps.c:1219 ../plug-ins/common/file-sunras.c:567 #: ../plug-ins/common/file-tga.c:1174 ../plug-ins/common/file-tiff-save.c:693 -#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1479 +#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1480 #: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:618 #: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:480 #: ../plug-ins/file-fli/fli-gimp.c:717 ../plug-ins/file-ico/ico-save.c:1001 #: ../plug-ins/file-jpeg/jpeg-save.c:286 ../plug-ins/file-psd/psd-save.c:1642 -#: ../plug-ins/file-sgi/sgi.c:553 ../plug-ins/file-xjt/xjt.c:1707 +#: ../plug-ins/file-sgi/sgi.c:553 ../plug-ins/file-xjt/xjt.c:1708 #, c-format msgid "Saving '%s'" msgstr "Сохранение \"%s\"" @@ -3080,45 +3080,45 @@ msgstr "Исходный код С" msgid "Save as C-Source" msgstr "Сохранить как исходный код C" -#: ../plug-ins/common/file-csource.c:690 +#: ../plug-ins/common/file-csource.c:691 msgid "_Prefixed name:" msgstr "Префиксное имя:" -#: ../plug-ins/common/file-csource.c:699 +#: ../plug-ins/common/file-csource.c:700 msgid "Co_mment:" msgstr "Комментарий:" #. Use Comment #. -#: ../plug-ins/common/file-csource.c:706 +#: ../plug-ins/common/file-csource.c:707 msgid "_Save comment to file" msgstr "Сохранить комментарий в файл" #. GLib types #. -#: ../plug-ins/common/file-csource.c:718 +#: ../plug-ins/common/file-csource.c:719 msgid "_Use GLib types (guint8*)" msgstr "Использовать типы GLib (guint8*)" #. Use Macros #. -#: ../plug-ins/common/file-csource.c:730 +#: ../plug-ins/common/file-csource.c:731 msgid "Us_e macros instead of struct" msgstr "Использовать макросы вместо структур" #. Use RLE #. -#: ../plug-ins/common/file-csource.c:742 +#: ../plug-ins/common/file-csource.c:743 msgid "Use _1 byte Run-Length-Encoding" msgstr "Использовать 1-байтное RLE" #. Alpha #. -#: ../plug-ins/common/file-csource.c:754 +#: ../plug-ins/common/file-csource.c:755 msgid "Sa_ve alpha channel (RGBA/RGB)" msgstr "Сохранить альфа-канал (RGBA/RGB)" -#: ../plug-ins/common/file-csource.c:772 +#: ../plug-ins/common/file-csource.c:773 msgid "Op_acity:" msgstr "Непрозрачность:" @@ -3153,7 +3153,7 @@ msgstr "Невозможно сохранить изображения с аль #: ../plug-ins/common/file-dicom.c:783 ../plug-ins/common/file-ps.c:1204 #: ../plug-ins/common/file-xwd.c:603 ../plug-ins/file-fits/fits.c:465 -#: ../plug-ins/file-xjt/xjt.c:1702 +#: ../plug-ins/file-xjt/xjt.c:1703 msgid "Cannot operate on unknown image types." msgstr "Невозможно выполнить действия с изображением неизвестного типа" @@ -3176,7 +3176,7 @@ msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Ошибочная строка UTF-8 в файле кисти '%s'" #: ../plug-ins/common/file-gbr.c:438 ../plug-ins/common/file-gih.c:491 -#: ../plug-ins/common/file-gih.c:1155 +#: ../plug-ins/common/file-gih.c:1156 #: ../plug-ins/gradient-flare/gradient-flare.c:3062 msgid "Unnamed" msgstr "Безымянное" @@ -3190,12 +3190,12 @@ msgid "Save as Brush" msgstr "Сохранить как кисть" #. attach labels -#: ../plug-ins/common/file-gbr.c:758 ../plug-ins/common/grid.c:789 +#: ../plug-ins/common/file-gbr.c:759 ../plug-ins/common/grid.c:790 msgid "Spacing:" msgstr "Интервал: " -#: ../plug-ins/common/file-gbr.c:769 ../plug-ins/common/file-gih.c:906 -#: ../plug-ins/common/file-pat.c:555 ../plug-ins/gimpressionist/presets.c:665 +#: ../plug-ins/common/file-gbr.c:770 ../plug-ins/common/file-gih.c:907 +#: ../plug-ins/common/file-pat.c:556 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Описание:" @@ -3299,65 +3299,65 @@ msgid "Save as GIF" msgstr "Сохранить как GIF" #. regular gif parameter settings -#: ../plug-ins/common/file-gif-save.c:1030 +#: ../plug-ins/common/file-gif-save.c:1031 msgid "GIF Options" msgstr "Параметры GIF" -#: ../plug-ins/common/file-gif-save.c:1036 +#: ../plug-ins/common/file-gif-save.c:1037 msgid "I_nterlace" msgstr "Черезстрочность" -#: ../plug-ins/common/file-gif-save.c:1052 +#: ../plug-ins/common/file-gif-save.c:1053 msgid "_GIF comment:" msgstr "Комментарий GIF:" #. additional animated gif parameter settings -#: ../plug-ins/common/file-gif-save.c:1110 +#: ../plug-ins/common/file-gif-save.c:1111 msgid "Animated GIF Options" msgstr "Параметры анимированного GIF" -#: ../plug-ins/common/file-gif-save.c:1116 +#: ../plug-ins/common/file-gif-save.c:1117 msgid "_Loop forever" msgstr "Бесконечный цикл" -#: ../plug-ins/common/file-gif-save.c:1129 +#: ../plug-ins/common/file-gif-save.c:1130 msgid "_Delay between frames where unspecified:" msgstr "Если задержка между кадрами не указана, она равна:" -#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1473 +#: ../plug-ins/common/file-gif-save.c:1145 ../plug-ins/common/file-mng.c:1474 msgid "milliseconds" msgstr "миллисекунд" -#: ../plug-ins/common/file-gif-save.c:1154 +#: ../plug-ins/common/file-gif-save.c:1155 msgid "_Frame disposal where unspecified:" msgstr "Расположение кадра, если не указано: " -#: ../plug-ins/common/file-gif-save.c:1158 +#: ../plug-ins/common/file-gif-save.c:1159 msgid "I don't care" msgstr "Не важно" -#: ../plug-ins/common/file-gif-save.c:1160 +#: ../plug-ins/common/file-gif-save.c:1161 msgid "Cumulative layers (combine)" msgstr "Наложение слоев (об'единение)" -#: ../plug-ins/common/file-gif-save.c:1162 +#: ../plug-ins/common/file-gif-save.c:1163 msgid "One frame per layer (replace)" msgstr "Один кадр на слой (замена)" #. The "Always use default values" toggles -#: ../plug-ins/common/file-gif-save.c:1178 +#: ../plug-ins/common/file-gif-save.c:1179 msgid "_Use delay entered above for all frames" msgstr "_Использовать указанную задержку в дальнейшем" -#: ../plug-ins/common/file-gif-save.c:1188 +#: ../plug-ins/common/file-gif-save.c:1189 msgid "U_se disposal entered above for all frames" msgstr "И_спользовать указанное расположение в дальнейшем" -#: ../plug-ins/common/file-gif-save.c:2341 +#: ../plug-ins/common/file-gif-save.c:2342 msgid "Error writing output file." msgstr "Ошибка при записи в файл вывода." -#: ../plug-ins/common/file-gif-save.c:2411 +#: ../plug-ins/common/file-gif-save.c:2412 #, c-format msgid "The default comment is limited to %d characters." msgstr "Комментарий по умолчанию ограничен длиной в %d символов." @@ -3382,47 +3382,47 @@ msgstr "Не удалось загрузить одну из кистей в п msgid "Save as Brush Pipe" msgstr "Сохранить как последовательность кистей" -#: ../plug-ins/common/file-gih.c:892 +#: ../plug-ins/common/file-gih.c:893 msgid "Spacing (percent):" msgstr "Интервал (проценты):" -#: ../plug-ins/common/file-gih.c:959 +#: ../plug-ins/common/file-gih.c:960 msgid "Pixels" msgstr "Точки растра" -#: ../plug-ins/common/file-gih.c:964 +#: ../plug-ins/common/file-gih.c:965 msgid "Cell size:" msgstr "Размер ячейки:" -#: ../plug-ins/common/file-gih.c:976 +#: ../plug-ins/common/file-gih.c:977 msgid "Number of cells:" msgstr "Число ячеек:" -#: ../plug-ins/common/file-gih.c:1001 +#: ../plug-ins/common/file-gih.c:1002 msgid " Rows of " msgstr " строк " -#: ../plug-ins/common/file-gih.c:1013 +#: ../plug-ins/common/file-gih.c:1014 msgid " Columns on each layer" msgstr " столбцов на каждом слое" -#: ../plug-ins/common/file-gih.c:1017 +#: ../plug-ins/common/file-gih.c:1018 msgid " (Width Mismatch!) " msgstr " (ошибочная ширина!) " -#: ../plug-ins/common/file-gih.c:1021 +#: ../plug-ins/common/file-gih.c:1022 msgid " (Height Mismatch!) " msgstr " (ошибочная высота!) " -#: ../plug-ins/common/file-gih.c:1026 +#: ../plug-ins/common/file-gih.c:1027 msgid "Display as:" msgstr "Показать как:" -#: ../plug-ins/common/file-gih.c:1035 +#: ../plug-ins/common/file-gih.c:1036 msgid "Dimension:" msgstr "Размер:" -#: ../plug-ins/common/file-gih.c:1110 +#: ../plug-ins/common/file-gih.c:1111 msgid "Ranks:" msgstr "Количество кадров:" @@ -3590,99 +3590,99 @@ msgstr "" msgid "Save as MNG" msgstr "Сохранить как MNG" -#: ../plug-ins/common/file-mng.c:1273 +#: ../plug-ins/common/file-mng.c:1274 msgid "MNG Options" msgstr "Параметры MNG" -#: ../plug-ins/common/file-mng.c:1279 +#: ../plug-ins/common/file-mng.c:1280 msgid "Interlace" msgstr "Черезстрочность" -#: ../plug-ins/common/file-mng.c:1291 +#: ../plug-ins/common/file-mng.c:1292 msgid "Save background color" msgstr "Сохранить цвет фона" -#: ../plug-ins/common/file-mng.c:1302 +#: ../plug-ins/common/file-mng.c:1303 msgid "Save gamma" msgstr "Сохранить гамму" -#: ../plug-ins/common/file-mng.c:1312 +#: ../plug-ins/common/file-mng.c:1313 msgid "Save resolution" msgstr "Сохранить разрешение" -#: ../plug-ins/common/file-mng.c:1323 +#: ../plug-ins/common/file-mng.c:1324 msgid "Save creation time" msgstr "Сохранить время создания" -#: ../plug-ins/common/file-mng.c:1342 +#: ../plug-ins/common/file-mng.c:1343 msgid "PNG" msgstr "PNG" -#: ../plug-ins/common/file-mng.c:1343 +#: ../plug-ins/common/file-mng.c:1344 msgid "JNG" msgstr "JNG" -#: ../plug-ins/common/file-mng.c:1346 +#: ../plug-ins/common/file-mng.c:1347 msgid "PNG + delta PNG" msgstr "PNG + delta PNG" -#: ../plug-ins/common/file-mng.c:1347 +#: ../plug-ins/common/file-mng.c:1348 msgid "JNG + delta PNG" msgstr "JNG + delta PNG" -#: ../plug-ins/common/file-mng.c:1348 +#: ../plug-ins/common/file-mng.c:1349 msgid "All PNG" msgstr "Все PNG" -#: ../plug-ins/common/file-mng.c:1349 +#: ../plug-ins/common/file-mng.c:1350 msgid "All JNG" msgstr "Все JNG" -#: ../plug-ins/common/file-mng.c:1361 +#: ../plug-ins/common/file-mng.c:1362 msgid "Default chunks type:" msgstr "Тип по умолчанию:" -#: ../plug-ins/common/file-mng.c:1364 +#: ../plug-ins/common/file-mng.c:1365 msgid "Combine" msgstr "Объединить" -#: ../plug-ins/common/file-mng.c:1365 +#: ../plug-ins/common/file-mng.c:1366 msgid "Replace" msgstr "Заместить" -#: ../plug-ins/common/file-mng.c:1376 +#: ../plug-ins/common/file-mng.c:1377 msgid "Default frame disposal:" msgstr "Кадры:" -#: ../plug-ins/common/file-mng.c:1388 +#: ../plug-ins/common/file-mng.c:1389 msgid "PNG compression level:" msgstr "Степень сжатия PNG:" -#: ../plug-ins/common/file-mng.c:1396 ../plug-ins/common/file-png.c:1907 +#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1907 msgid "Choose a high compression level for small file size" msgstr "Выберите большую степень сжатия для получения файла меньшего размера" -#: ../plug-ins/common/file-mng.c:1410 +#: ../plug-ins/common/file-mng.c:1411 msgid "JPEG compression quality:" msgstr "Качество сжатия JPEG:" -#: ../plug-ins/common/file-mng.c:1427 +#: ../plug-ins/common/file-mng.c:1428 msgid "JPEG smoothing factor:" msgstr "Показатель сглаживания JPEG:" -#: ../plug-ins/common/file-mng.c:1437 +#: ../plug-ins/common/file-mng.c:1438 msgid "Animated MNG Options" msgstr "Параметры анимированного MNG" -#: ../plug-ins/common/file-mng.c:1443 +#: ../plug-ins/common/file-mng.c:1444 msgid "Loop" msgstr "Цикл" -#: ../plug-ins/common/file-mng.c:1457 +#: ../plug-ins/common/file-mng.c:1458 msgid "Default frame delay:" msgstr "Задержка кадра по умолчанию:" -#: ../plug-ins/common/file-mng.c:1530 +#: ../plug-ins/common/file-mng.c:1531 msgid "MNG animation" msgstr "Параметры MNG" @@ -3783,19 +3783,19 @@ msgstr "Импорт из PDF" msgid "_Import" msgstr "_Импортировать" -#: ../plug-ins/common/file-pdf.c:888 +#: ../plug-ins/common/file-pdf.c:889 msgid "_Width (pixels):" msgstr "_Ширина (пикселов):" -#: ../plug-ins/common/file-pdf.c:889 +#: ../plug-ins/common/file-pdf.c:890 msgid "_Height (pixels):" msgstr "_Высота (пикселов):" -#: ../plug-ins/common/file-pdf.c:891 +#: ../plug-ins/common/file-pdf.c:892 msgid "_Resolution:" msgstr "_Разрешение:" -#: ../plug-ins/common/file-pdf.c:1165 +#: ../plug-ins/common/file-pdf.c:1166 #, c-format msgid "pixels/%s" msgstr "точек растра/%s" @@ -3877,7 +3877,7 @@ msgstr "Сохранить значения цвета прозрачных то msgid "Co_mpression level:" msgstr "Степень сжатия:" -#: ../plug-ins/common/file-png.c:1921 ../plug-ins/file-jpeg/jpeg-save.c:1190 +#: ../plug-ins/common/file-png.c:1921 ../plug-ins/file-jpeg/jpeg-save.c:1192 msgid "_Load Defaults" msgstr "З_агрузить исходные параметры" @@ -3995,7 +3995,7 @@ msgstr "" "местоположения исполняемого файла Ghostscript.\n" "(%s)" -#: ../plug-ins/common/file-ps.c:1931 ../plug-ins/common/file-tiff-load.c:999 +#: ../plug-ins/common/file-ps.c:1931 ../plug-ins/common/file-tiff-load.c:1000 #, c-format msgid "Page %d" msgstr "Страница %d" @@ -4030,7 +4030,7 @@ msgstr "Страницы:" msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "Страницы для загрузки (напр.: 1-4 или 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3200 ../plug-ins/common/sphere-designer.c:2642 +#: ../plug-ins/common/file-ps.c:3200 ../plug-ins/common/sphere-designer.c:2643 msgid "Layers" msgstr "Слои" @@ -4172,79 +4172,79 @@ msgstr "Raw Image Data" msgid "Load Image from Raw Data" msgstr "Загрузка изображения из Raw-данных" -#: ../plug-ins/common/file-raw.c:1085 +#: ../plug-ins/common/file-raw.c:1086 msgid "Image" msgstr "Изображение" -#: ../plug-ins/common/file-raw.c:1096 +#: ../plug-ins/common/file-raw.c:1097 msgid "RGB Alpha" msgstr "RGB с альфа-каналом" -#: ../plug-ins/common/file-raw.c:1097 +#: ../plug-ins/common/file-raw.c:1098 msgid "RGB565" msgstr "RGB565" -#: ../plug-ins/common/file-raw.c:1098 +#: ../plug-ins/common/file-raw.c:1099 msgid "Planar RGB" msgstr "Planar RGB" -#: ../plug-ins/common/file-raw.c:1099 +#: ../plug-ins/common/file-raw.c:1100 msgid "Indexed" msgstr "Индексированное" -#: ../plug-ins/common/file-raw.c:1100 +#: ../plug-ins/common/file-raw.c:1101 msgid "Indexed Alpha" msgstr "Индексированное с альфа-каналом" -#: ../plug-ins/common/file-raw.c:1105 +#: ../plug-ins/common/file-raw.c:1106 msgid "Image _Type:" msgstr "Тип изображения:" -#: ../plug-ins/common/file-raw.c:1155 +#: ../plug-ins/common/file-raw.c:1156 msgid "Palette" msgstr "Палитра" -#: ../plug-ins/common/file-raw.c:1165 ../plug-ins/common/file-raw.c:1264 +#: ../plug-ins/common/file-raw.c:1166 ../plug-ins/common/file-raw.c:1265 msgid "R, G, B (normal)" msgstr "R, G, B (normal)" -#: ../plug-ins/common/file-raw.c:1166 ../plug-ins/common/file-raw.c:1266 +#: ../plug-ins/common/file-raw.c:1167 ../plug-ins/common/file-raw.c:1267 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (BMP-стиль)" -#: ../plug-ins/common/file-raw.c:1171 +#: ../plug-ins/common/file-raw.c:1172 msgid "_Palette Type:" msgstr "Тип _палитры:" -#: ../plug-ins/common/file-raw.c:1182 +#: ../plug-ins/common/file-raw.c:1183 msgid "Off_set:" msgstr "С_мещение:" -#: ../plug-ins/common/file-raw.c:1194 +#: ../plug-ins/common/file-raw.c:1195 msgid "Select Palette File" msgstr "Выберите файл палитры" -#: ../plug-ins/common/file-raw.c:1200 +#: ../plug-ins/common/file-raw.c:1201 msgid "Pal_ette File:" msgstr "_Файл палитры:" -#: ../plug-ins/common/file-raw.c:1228 +#: ../plug-ins/common/file-raw.c:1229 msgid "Raw Image Save" msgstr "Сохранить Raw" -#: ../plug-ins/common/file-raw.c:1250 +#: ../plug-ins/common/file-raw.c:1251 msgid "RGB Save Type" msgstr "Тип сохранения RGB" -#: ../plug-ins/common/file-raw.c:1254 +#: ../plug-ins/common/file-raw.c:1255 msgid "Standard (R,G,B)" msgstr "Стандартный (R,G,B)" -#: ../plug-ins/common/file-raw.c:1255 +#: ../plug-ins/common/file-raw.c:1256 msgid "Planar (RRR,GGG,BBB)" msgstr "Planar (RRR,GGG,BBB)" -#: ../plug-ins/common/file-raw.c:1260 +#: ../plug-ins/common/file-raw.c:1261 msgid "Indexed Palette Type" msgstr "Тип индексированной палитры" @@ -4380,7 +4380,7 @@ msgstr "Создать Scalable Vector Graphics" #. Width and Height #: ../plug-ins/common/file-svg.c:794 ../plug-ins/common/file-wmf.c:570 -#: ../plug-ins/common/grid.c:723 +#: ../plug-ins/common/grid.c:724 msgid "Width:" msgstr "Ширина:" @@ -4477,16 +4477,16 @@ msgstr "TIFF '%s' не содержит каталоги" msgid "Import from TIFF" msgstr "Импорт TIFF" -#: ../plug-ins/common/file-tiff-load.c:780 +#: ../plug-ins/common/file-tiff-load.c:781 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-из-%d-страниц" -#: ../plug-ins/common/file-tiff-load.c:1015 +#: ../plug-ins/common/file-tiff-load.c:1016 msgid "TIFF Channel" msgstr "Канал TIFF" -#: ../plug-ins/common/file-tiff-load.c:1024 +#: ../plug-ins/common/file-tiff-load.c:1025 #: ../plug-ins/file-psd/psd-load.c:324 msgid "" "Warning:\n" @@ -4667,81 +4667,81 @@ msgstr "Записать дополнительный файл маски" msgid "_Mask file extension:" msgstr "Расширение файла маски:" -#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:371 +#: ../plug-ins/common/file-xmc.c:332 ../plug-ins/common/file-xmc.c:372 msgid "X11 Mouse Cursor" msgstr "Указатель мыши X11" -#: ../plug-ins/common/file-xmc.c:479 +#: ../plug-ins/common/file-xmc.c:480 #, c-format msgid "" "Cannot set the hotspot!\n" "You must arrange layers so that all of them have an intersection." msgstr "" -#: ../plug-ins/common/file-xmc.c:672 +#: ../plug-ins/common/file-xmc.c:673 #, c-format msgid "'%s' is not a valid X cursor." msgstr "'%s' не является корректным курсором X." -#: ../plug-ins/common/file-xmc.c:688 +#: ../plug-ins/common/file-xmc.c:689 #, c-format msgid "The width of frame %d of '%s' is too big for X cursor." msgstr "" -#: ../plug-ins/common/file-xmc.c:695 +#: ../plug-ins/common/file-xmc.c:696 #, c-format msgid "The height of frame %d of '%s' is too big for X cursor." msgstr "" -#: ../plug-ins/common/file-xmc.c:900 +#: ../plug-ins/common/file-xmc.c:901 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "" -#: ../plug-ins/common/file-xmc.c:942 +#: ../plug-ins/common/file-xmc.c:943 #, c-format msgid "The width of '%s' is too big for X cursor." msgstr "Ширина '%s' слишком велика для указателя X." -#: ../plug-ins/common/file-xmc.c:949 +#: ../plug-ins/common/file-xmc.c:950 #, c-format msgid "The height of '%s' is too big for X cursor." msgstr "Высота '%s' слишком велика для указателя X." -#: ../plug-ins/common/file-xmc.c:1019 +#: ../plug-ins/common/file-xmc.c:1020 #, c-format msgid "A read error occurred." msgstr "Произошла ошибка при чтении." -#: ../plug-ins/common/file-xmc.c:1056 +#: ../plug-ins/common/file-xmc.c:1057 msgid "Save as X11 Mouse Cursor" msgstr "Сохранить как указатель мыши X11" #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1076 +#: ../plug-ins/common/file-xmc.c:1077 msgid "XMC Options" msgstr "Параметры XMC" -#: ../plug-ins/common/file-xmc.c:1104 +#: ../plug-ins/common/file-xmc.c:1105 msgid "Enter the X coordinate of the hotspot.The origin is top left corner." msgstr "" -#: ../plug-ins/common/file-xmc.c:1108 +#: ../plug-ins/common/file-xmc.c:1109 #, fuzzy msgid "Hotspot _X:" msgstr "«Горячая точка» X:" -#: ../plug-ins/common/file-xmc.c:1122 +#: ../plug-ins/common/file-xmc.c:1123 msgid "Enter the Y coordinate of the hotspot.The origin is top left corner." msgstr "" -#: ../plug-ins/common/file-xmc.c:1133 +#: ../plug-ins/common/file-xmc.c:1134 msgid "_Auto-Crop all frames." msgstr "_Автокадрировать все кадры" -#: ../plug-ins/common/file-xmc.c:1146 +#: ../plug-ins/common/file-xmc.c:1147 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4749,7 +4749,7 @@ msgid "" "Uncheck if you plan to edit the exported cursor using other programs." msgstr "" -#: ../plug-ins/common/file-xmc.c:1169 +#: ../plug-ins/common/file-xmc.c:1170 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4760,53 +4760,53 @@ msgid "" "theme-size\"." msgstr "" -#: ../plug-ins/common/file-xmc.c:1186 +#: ../plug-ins/common/file-xmc.c:1187 msgid "_Use this value only for a frame which size is not specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1189 +#: ../plug-ins/common/file-xmc.c:1190 msgid "_Replace the size of all frames even if it is specified." -msgstr "" +msgstr "_Заменить размер всех кадров, ладе если он уже указан" -#: ../plug-ins/common/file-xmc.c:1223 +#: ../plug-ins/common/file-xmc.c:1224 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "" -#: ../plug-ins/common/file-xmc.c:1226 +#: ../plug-ins/common/file-xmc.c:1227 msgid "_Delay:" msgstr "_Задержка:" -#: ../plug-ins/common/file-xmc.c:1231 +#: ../plug-ins/common/file-xmc.c:1232 msgid "_Use this value only for a frame which delay is not specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1234 +#: ../plug-ins/common/file-xmc.c:1235 msgid "_Replace the delay of all frames even if it is specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1259 +#: ../plug-ins/common/file-xmc.c:1260 msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" -#: ../plug-ins/common/file-xmc.c:1269 +#: ../plug-ins/common/file-xmc.c:1270 msgid "Enter copyright information." -msgstr "" +msgstr "Укажите информацию об авторских правах" -#: ../plug-ins/common/file-xmc.c:1271 +#: ../plug-ins/common/file-xmc.c:1272 msgid "_Copyright:" msgstr "_Авторские права:" -#: ../plug-ins/common/file-xmc.c:1287 +#: ../plug-ins/common/file-xmc.c:1288 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" -#: ../plug-ins/common/file-xmc.c:1297 +#: ../plug-ins/common/file-xmc.c:1298 msgid "Enter license information." msgstr "Введите информацию о лицензии" -#: ../plug-ins/common/file-xmc.c:1299 +#: ../plug-ins/common/file-xmc.c:1300 msgid "_License:" msgstr "_Лицензия:" @@ -4815,47 +4815,47 @@ msgstr "_Лицензия:" #. #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". -#: ../plug-ins/common/file-xmc.c:1306 +#: ../plug-ins/common/file-xmc.c:1307 msgid "_Other:" msgstr "_Прочее:" -#: ../plug-ins/common/file-xmc.c:1340 +#: ../plug-ins/common/file-xmc.c:1341 msgid "Enter other comment if you want." msgstr "" -#: ../plug-ins/common/file-xmc.c:1390 +#: ../plug-ins/common/file-xmc.c:1391 #, c-format msgid "Comment is limited to %d characters." msgstr "Комментарий ограничен %d символами." -#: ../plug-ins/common/file-xmc.c:1508 +#: ../plug-ins/common/file-xmc.c:1509 #, c-format msgid "This plug-in can only handle RGBA image format with 8bit color depth." msgstr "" -#: ../plug-ins/common/file-xmc.c:1526 +#: ../plug-ins/common/file-xmc.c:1527 #, c-format msgid "Width of '%s' is too large. Please reduce more than %dpx)" msgstr "" -#: ../plug-ins/common/file-xmc.c:1533 +#: ../plug-ins/common/file-xmc.c:1534 #, c-format msgid "Height of '%s' is too large. Please reduce more than %dpx)" msgstr "" -#: ../plug-ins/common/file-xmc.c:1540 +#: ../plug-ins/common/file-xmc.c:1541 #, c-format msgid "The size of '%s' is zero!" msgstr "Размер '%s' равен нулю!" -#: ../plug-ins/common/file-xmc.c:1580 +#: ../plug-ins/common/file-xmc.c:1581 #, c-format msgid "" "Cannot save the cursor because the hotspot is not on '%s'.\n" "Try to change the hotspot position, layer geometry or save without auto-crop." msgstr "" -#: ../plug-ins/common/file-xmc.c:1735 +#: ../plug-ins/common/file-xmc.c:1736 #, c-format msgid "" "Your cursor was successfully saved but it contains one or more frames which " @@ -4863,22 +4863,27 @@ msgid "" "It will clutter the screen in some environments." msgstr "" -#: ../plug-ins/common/file-xmc.c:1742 +#: ../plug-ins/common/file-xmc.c:1743 msgid "" "Your cursor was successfully saved but it contains one or more frames which " "nominal size is not supported by gnome-appearance-properties.\n" "You can satisfy it by checking \"Replace the size of all frame...\" in save " "dialog, or Your cursor may not appear in gnome-appearance-properties." msgstr "" +"Курсор был успешно сохранен, но размер некоторых его кадров не " +"поддерживается апплетом gnome-appearance-properties.\n" +"Вы можете исправить это, включив функцию «Заменить размер всех кадров...» в " +"диалоге сохранения. В противном случае курсор не появится в апплете " +"настройки внешнего вида рабочей среды." -#: ../plug-ins/common/file-xmc.c:1979 +#: ../plug-ins/common/file-xmc.c:1980 #, c-format msgid "" "The parasite \"%s\" is too long for X cursor.\n" "The overflowed string was dropped." msgstr "" -#: ../plug-ins/common/file-xmc.c:2181 +#: ../plug-ins/common/file-xmc.c:2182 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -4986,7 +4991,7 @@ msgid "Select Film Color" msgstr "Выбрать цвет пленки" #: ../plug-ins/common/film.c:1025 ../plug-ins/common/film.c:1075 -#: ../plug-ins/common/nova.c:352 +#: ../plug-ins/common/nova.c:353 msgid "Co_lor:" msgstr "_Цвет:" @@ -5139,7 +5144,7 @@ msgstr "Варианты тона" msgid "Roughness" msgstr "Шероховатость" -#: ../plug-ins/common/filter-pack.c:673 ../plug-ins/common/filter-pack.c:1316 +#: ../plug-ins/common/filter-pack.c:673 ../plug-ins/common/filter-pack.c:1317 msgid "Affected Range" msgstr "Обрабатываемый диапазон" @@ -5159,7 +5164,7 @@ msgstr "Я_ркие участки:" msgid "Windows" msgstr "Окна" -#: ../plug-ins/common/filter-pack.c:703 ../plug-ins/common/van-gogh-lic.c:671 +#: ../plug-ins/common/filter-pack.c:703 ../plug-ins/common/van-gogh-lic.c:672 msgid "_Saturation" msgstr "_Насыщенность" @@ -5211,24 +5216,24 @@ msgstr "Выделение в контексте" msgid "Filter Pack Simulation" msgstr "Моделирование набора фильтров" -#: ../plug-ins/common/filter-pack.c:1289 +#: ../plug-ins/common/filter-pack.c:1290 msgid "Shadows:" msgstr "Тени:" -#: ../plug-ins/common/filter-pack.c:1290 +#: ../plug-ins/common/filter-pack.c:1291 msgid "Midtones:" msgstr "Полутона:" -#: ../plug-ins/common/filter-pack.c:1291 +#: ../plug-ins/common/filter-pack.c:1292 msgid "Highlights:" msgstr "Блики:" -#: ../plug-ins/common/filter-pack.c:1304 +#: ../plug-ins/common/filter-pack.c:1305 msgid "Advanced Filter Pack Options" msgstr "Дополнительные параметры пакета фильтров" #. ****************** MISC OPTIONS ************************** -#: ../plug-ins/common/filter-pack.c:1416 +#: ../plug-ins/common/filter-pack.c:1417 msgid "Preview Size" msgstr "Размер просмотра" @@ -5246,31 +5251,31 @@ msgid "Fractal Trace" msgstr "Фрактальный след" #. Settings -#: ../plug-ins/common/fractal-trace.c:730 +#: ../plug-ins/common/fractal-trace.c:731 msgid "Outside Type" msgstr "Тип вывода" -#: ../plug-ins/common/fractal-trace.c:741 +#: ../plug-ins/common/fractal-trace.c:742 msgid "_White" msgstr "_Белый" -#: ../plug-ins/common/fractal-trace.c:748 +#: ../plug-ins/common/fractal-trace.c:749 msgid "Mandelbrot Parameters" msgstr "Параметры Мандельброта" -#: ../plug-ins/common/fractal-trace.c:759 +#: ../plug-ins/common/fractal-trace.c:760 msgid "X_1:" msgstr "X1:" -#: ../plug-ins/common/fractal-trace.c:768 +#: ../plug-ins/common/fractal-trace.c:769 msgid "X_2:" msgstr "X2:" -#: ../plug-ins/common/fractal-trace.c:777 +#: ../plug-ins/common/fractal-trace.c:778 msgid "Y_1:" msgstr "Y1:" -#: ../plug-ins/common/fractal-trace.c:786 +#: ../plug-ins/common/fractal-trace.c:787 msgid "Y_2:" msgstr "Y2:" @@ -5336,39 +5341,39 @@ msgstr "_Сетка..." msgid "Drawing grid" msgstr "Рисование сетки" -#: ../plug-ins/common/grid.c:634 ../plug-ins/gfig/gfig-dialog.c:1354 +#: ../plug-ins/common/grid.c:634 ../plug-ins/gfig/gfig-dialog.c:1355 #: ../plug-ins/imagemap/imap_menu.c:208 msgid "Grid" msgstr "Сетка" #. attach labels -#: ../plug-ins/common/grid.c:716 +#: ../plug-ins/common/grid.c:717 msgid "Horizontal" msgstr "Горизонталь" -#: ../plug-ins/common/grid.c:718 +#: ../plug-ins/common/grid.c:719 msgid "Vertical" msgstr "Вертикаль" -#: ../plug-ins/common/grid.c:720 +#: ../plug-ins/common/grid.c:721 msgid "Intersection" msgstr "Пересечение" #. attach labels -#: ../plug-ins/common/grid.c:856 +#: ../plug-ins/common/grid.c:857 msgid "Offset:" msgstr "Смещение:" #. attach color selectors -#: ../plug-ins/common/grid.c:895 +#: ../plug-ins/common/grid.c:896 msgid "Horizontal Color" msgstr "Цвет для горизонталей" -#: ../plug-ins/common/grid.c:913 +#: ../plug-ins/common/grid.c:914 msgid "Vertical Color" msgstr "Цвет для вертикалей" -#: ../plug-ins/common/grid.c:931 +#: ../plug-ins/common/grid.c:932 msgid "Intersection Color" msgstr "Цвет пересечений" @@ -5396,23 +5401,23 @@ msgstr "«Горячие» _цвета..." msgid "Hot" msgstr "«Горячие» цвета" -#: ../plug-ins/common/hot.c:622 +#: ../plug-ins/common/hot.c:623 msgid "Create _new layer" msgstr "Создать _новый слой" -#: ../plug-ins/common/hot.c:631 +#: ../plug-ins/common/hot.c:632 msgid "Action" msgstr "Действие" -#: ../plug-ins/common/hot.c:635 +#: ../plug-ins/common/hot.c:636 msgid "Reduce _Luminance" msgstr "Уменьшить _яркость" -#: ../plug-ins/common/hot.c:636 +#: ../plug-ins/common/hot.c:637 msgid "Reduce _Saturation" msgstr "Уменьшить на_сыщенность" -#: ../plug-ins/common/hot.c:637 ../plug-ins/common/waves.c:282 +#: ../plug-ins/common/hot.c:638 ../plug-ins/common/waves.c:283 msgid "_Blacken" msgstr "Сделать _чёрным" @@ -5428,15 +5433,15 @@ msgstr "_Иллюзия..." msgid "Illusion" msgstr "Иллюзия" -#: ../plug-ins/common/illusion.c:387 +#: ../plug-ins/common/illusion.c:388 msgid "_Divisions:" msgstr "_Деление:" -#: ../plug-ins/common/illusion.c:397 +#: ../plug-ins/common/illusion.c:398 msgid "Mode _1" msgstr "Режим _1" -#: ../plug-ins/common/illusion.c:412 +#: ../plug-ins/common/illusion.c:413 msgid "Mode _2" msgstr "Режим _2" @@ -5568,56 +5573,56 @@ msgstr "Сборка головоломки" msgid "Jigsaw" msgstr "Головоломка" -#: ../plug-ins/common/jigsaw.c:2444 +#: ../plug-ins/common/jigsaw.c:2445 msgid "Number of Tiles" msgstr "Число частей головоломки" -#: ../plug-ins/common/jigsaw.c:2459 +#: ../plug-ins/common/jigsaw.c:2460 msgid "Number of pieces going across" msgstr "Число частей по горизонтали" -#: ../plug-ins/common/jigsaw.c:2476 +#: ../plug-ins/common/jigsaw.c:2477 msgid "Number of pieces going down" msgstr "Число частей по вертикали" -#: ../plug-ins/common/jigsaw.c:2490 +#: ../plug-ins/common/jigsaw.c:2491 msgid "Bevel Edges" msgstr "Фаска краёв" -#: ../plug-ins/common/jigsaw.c:2500 +#: ../plug-ins/common/jigsaw.c:2501 msgid "_Bevel width:" msgstr "_Рельеф краев:" -#: ../plug-ins/common/jigsaw.c:2504 +#: ../plug-ins/common/jigsaw.c:2505 msgid "Degree of slope of each piece's edge" msgstr "Степень наклона кромки" -#: ../plug-ins/common/jigsaw.c:2517 +#: ../plug-ins/common/jigsaw.c:2518 msgid "H_ighlight:" msgstr "_Блики:" -#: ../plug-ins/common/jigsaw.c:2521 +#: ../plug-ins/common/jigsaw.c:2522 msgid "The amount of highlighting on the edges of each piece" msgstr "Размер блика на краях каждого кусочка" #. frame for primitive radio buttons -#: ../plug-ins/common/jigsaw.c:2538 +#: ../plug-ins/common/jigsaw.c:2539 msgid "Jigsaw Style" msgstr "Стиль элементов головоломки" -#: ../plug-ins/common/jigsaw.c:2542 +#: ../plug-ins/common/jigsaw.c:2543 msgid "_Square" msgstr "_Квадратные" -#: ../plug-ins/common/jigsaw.c:2543 +#: ../plug-ins/common/jigsaw.c:2544 msgid "C_urved" msgstr "_Искривленные" -#: ../plug-ins/common/jigsaw.c:2547 +#: ../plug-ins/common/jigsaw.c:2548 msgid "Each piece has straight sides" msgstr "Каждый кусочек имеет прямые стороны" -#: ../plug-ins/common/jigsaw.c:2548 +#: ../plug-ins/common/jigsaw.c:2549 msgid "Each piece has curved sides" msgstr "Каждый кусочек имеет искривленные стороны" @@ -5705,60 +5710,60 @@ msgstr "_Оставить как есть" msgid "_Convert" msgstr "_Преобразовать" -#: ../plug-ins/common/lcms.c:1262 ../plug-ins/file-jpeg/jpeg-exif.c:376 +#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:376 msgid "_Don't ask me again" msgstr "_Больше не спрашивать" -#: ../plug-ins/common/lcms.c:1326 +#: ../plug-ins/common/lcms.c:1327 msgid "Select destination profile" msgstr "Выберите конечный профиль" -#: ../plug-ins/common/lcms.c:1353 +#: ../plug-ins/common/lcms.c:1354 msgid "All files (*.*)" msgstr "Все файлы (*.*)" -#: ../plug-ins/common/lcms.c:1358 +#: ../plug-ins/common/lcms.c:1359 msgid "ICC color profile (*.icc, *.icm)" msgstr "Цветовой ICC-профиль (*.icc, *.icm)" -#: ../plug-ins/common/lcms.c:1401 +#: ../plug-ins/common/lcms.c:1402 #, c-format msgid "RGB workspace (%s)" msgstr "Рабочее пространство RGB (%s)" -#: ../plug-ins/common/lcms.c:1451 +#: ../plug-ins/common/lcms.c:1452 msgid "Convert to ICC Color Profile" msgstr "Преобразовать в цветовой ICC-профиль" -#: ../plug-ins/common/lcms.c:1452 +#: ../plug-ins/common/lcms.c:1453 msgid "Assign ICC Color Profile" msgstr "Назначить цветовой профиль" -#: ../plug-ins/common/lcms.c:1460 +#: ../plug-ins/common/lcms.c:1461 msgid "_Assign" msgstr "_Назначить" -#: ../plug-ins/common/lcms.c:1477 +#: ../plug-ins/common/lcms.c:1479 msgid "Current Color Profile" msgstr "Текущий цветовой профиль" -#: ../plug-ins/common/lcms.c:1492 +#: ../plug-ins/common/lcms.c:1494 msgid "Convert to" msgstr "Преобразовать в" -#: ../plug-ins/common/lcms.c:1492 +#: ../plug-ins/common/lcms.c:1494 msgid "Assign" msgstr "Назначить" -#: ../plug-ins/common/lcms.c:1516 +#: ../plug-ins/common/lcms.c:1518 msgid "_Rendering Intent:" msgstr "_Цель цветопередачи:" -#: ../plug-ins/common/lcms.c:1532 +#: ../plug-ins/common/lcms.c:1534 msgid "_Black Point Compensation" msgstr "Использовать _компенсацию черной точки" -#: ../plug-ins/common/lcms.c:1574 +#: ../plug-ins/common/lcms.c:1576 msgid "Destination profile is not for RGB color space." msgstr "Профиль вывода не предназначен для цветового пространства RGB." @@ -5778,23 +5783,23 @@ msgstr "Применяется линза" msgid "Lens Effect" msgstr "Эффект линзы" -#: ../plug-ins/common/lens-apply.c:426 +#: ../plug-ins/common/lens-apply.c:427 msgid "_Keep original surroundings" msgstr "_Сохранять исходное окружение" -#: ../plug-ins/common/lens-apply.c:441 +#: ../plug-ins/common/lens-apply.c:442 msgid "_Set surroundings to index 0" msgstr "_Устанавливать окружение в индекс 0" -#: ../plug-ins/common/lens-apply.c:442 +#: ../plug-ins/common/lens-apply.c:443 msgid "_Set surroundings to background color" msgstr "_Устанавливать окружение в цвет фона" -#: ../plug-ins/common/lens-apply.c:457 +#: ../plug-ins/common/lens-apply.c:458 msgid "_Make surroundings transparent" msgstr "_Делать окружение прозрачным" -#: ../plug-ins/common/lens-apply.c:474 +#: ../plug-ins/common/lens-apply.c:475 msgid "_Lens refraction index:" msgstr "_Коэффициент преломления линзы:" @@ -5814,27 +5819,27 @@ msgstr "Коррекция искажений оптики" msgid "Lens Distortion" msgstr "Коррекция искажений оптики" -#: ../plug-ins/common/lens-distortion.c:518 +#: ../plug-ins/common/lens-distortion.c:519 msgid "_Main:" msgstr "_Главная:" -#: ../plug-ins/common/lens-distortion.c:532 +#: ../plug-ins/common/lens-distortion.c:533 msgid "_Edge:" msgstr "_Край:" -#: ../plug-ins/common/lens-distortion.c:546 ../plug-ins/flame/flame.c:1236 +#: ../plug-ins/common/lens-distortion.c:547 ../plug-ins/flame/flame.c:1236 msgid "_Zoom:" msgstr "_Масштаб:" -#: ../plug-ins/common/lens-distortion.c:560 +#: ../plug-ins/common/lens-distortion.c:561 msgid "_Brighten:" msgstr "_Яркость:" -#: ../plug-ins/common/lens-distortion.c:574 +#: ../plug-ins/common/lens-distortion.c:575 msgid "_X shift:" msgstr "Сдвиг по _Х:" -#: ../plug-ins/common/lens-distortion.c:588 +#: ../plug-ins/common/lens-distortion.c:589 msgid "_Y shift:" msgstr "Сдвиг по _Y:" @@ -5854,11 +5859,11 @@ msgstr "Создание отблеска" msgid "Lens Flare" msgstr "Отблеск линзы" -#: ../plug-ins/common/lens-flare.c:752 +#: ../plug-ins/common/lens-flare.c:753 msgid "Center of Flare Effect" msgstr "Центр отблеска" -#: ../plug-ins/common/lens-flare.c:792 ../plug-ins/common/nova.c:483 +#: ../plug-ins/common/lens-flare.c:793 ../plug-ins/common/nova.c:484 msgid "Show _position" msgstr "_Показать позицию" @@ -5925,11 +5930,11 @@ msgstr "Макс. RGB" msgid "Maximum RGB Value" msgstr "Макс. значение RGB" -#: ../plug-ins/common/max-rgb.c:291 +#: ../plug-ins/common/max-rgb.c:292 msgid "_Hold the maximal channels" msgstr "Сохранять _максимальные каналы" -#: ../plug-ins/common/max-rgb.c:294 +#: ../plug-ins/common/max-rgb.c:295 msgid "Ho_ld the minimal channels" msgstr "Сохранять м_инимальные каналы" @@ -5955,63 +5960,63 @@ msgstr "Визуализация элементов" msgid "Mosaic" msgstr "Мозаика" -#: ../plug-ins/common/mosaic.c:632 +#: ../plug-ins/common/mosaic.c:633 msgid "Squares" msgstr "Квадраты" -#: ../plug-ins/common/mosaic.c:633 +#: ../plug-ins/common/mosaic.c:634 msgid "Hexagons" msgstr "Шестиугольники" -#: ../plug-ins/common/mosaic.c:634 +#: ../plug-ins/common/mosaic.c:635 msgid "Octagons & squares" msgstr "Восьмиугольники и квадраты" -#: ../plug-ins/common/mosaic.c:635 +#: ../plug-ins/common/mosaic.c:636 msgid "Triangles" msgstr "Треугольники" -#: ../plug-ins/common/mosaic.c:643 +#: ../plug-ins/common/mosaic.c:644 msgid "_Tiling primitives:" msgstr "_Элементы мозаики:" -#: ../plug-ins/common/mosaic.c:651 +#: ../plug-ins/common/mosaic.c:652 msgid "Tile _size:" msgstr "_Размер элемента:" -#: ../plug-ins/common/mosaic.c:663 ../plug-ins/common/tile-glass.c:302 +#: ../plug-ins/common/mosaic.c:664 ../plug-ins/common/tile-glass.c:303 msgid "Tile _height:" msgstr "_Высота блока:" -#: ../plug-ins/common/mosaic.c:676 +#: ../plug-ins/common/mosaic.c:677 msgid "Til_e spacing:" msgstr "_Интервал между элементами:" -#: ../plug-ins/common/mosaic.c:688 +#: ../plug-ins/common/mosaic.c:689 msgid "Tile _neatness:" msgstr "Ро_вность элементов:" -#: ../plug-ins/common/mosaic.c:701 +#: ../plug-ins/common/mosaic.c:702 msgid "Light _direction:" msgstr "_Направление освещения:" -#: ../plug-ins/common/mosaic.c:713 +#: ../plug-ins/common/mosaic.c:714 msgid "Color _variation:" msgstr "Цветовые в_ариации:" -#: ../plug-ins/common/mosaic.c:742 +#: ../plug-ins/common/mosaic.c:743 msgid "Co_lor averaging" msgstr "_Усреднение цвета" -#: ../plug-ins/common/mosaic.c:755 +#: ../plug-ins/common/mosaic.c:756 msgid "Allo_w tile splitting" msgstr "_Разрешить расщепление элементов" -#: ../plug-ins/common/mosaic.c:768 +#: ../plug-ins/common/mosaic.c:769 msgid "_Pitted surfaces" msgstr "Пов_ерхности с выемками" -#: ../plug-ins/common/mosaic.c:781 +#: ../plug-ins/common/mosaic.c:782 msgid "_FG/BG lighting" msgstr "Осве_тление переднего плана/фона" @@ -6078,62 +6083,62 @@ msgid "_Spot function:" msgstr "_Спот-функция:" #. resolution settings -#: ../plug-ins/common/newsprint.c:1239 +#: ../plug-ins/common/newsprint.c:1240 msgid "Resolution" msgstr "Разрешение" -#: ../plug-ins/common/newsprint.c:1258 +#: ../plug-ins/common/newsprint.c:1259 msgid "_Input SPI:" msgstr "SPI на _входе:" -#: ../plug-ins/common/newsprint.c:1272 +#: ../plug-ins/common/newsprint.c:1273 msgid "O_utput LPI:" msgstr "LPI на в_ыходе:" -#: ../plug-ins/common/newsprint.c:1285 +#: ../plug-ins/common/newsprint.c:1286 msgid "C_ell size:" msgstr "_Размер ячейки:" #. screen settings -#: ../plug-ins/common/newsprint.c:1298 +#: ../plug-ins/common/newsprint.c:1299 #: ../plug-ins/gradient-flare/gradient-flare.c:553 msgid "Screen" msgstr "Экран" -#: ../plug-ins/common/newsprint.c:1317 +#: ../plug-ins/common/newsprint.c:1318 msgid "B_lack pullout (%):" msgstr "_Черная составляющая (%):" -#: ../plug-ins/common/newsprint.c:1339 +#: ../plug-ins/common/newsprint.c:1340 msgid "Separate to:" msgstr "Разделить на:" -#: ../plug-ins/common/newsprint.c:1343 +#: ../plug-ins/common/newsprint.c:1344 msgid "_RGB" msgstr "_RGB" -#: ../plug-ins/common/newsprint.c:1360 +#: ../plug-ins/common/newsprint.c:1361 msgid "C_MYK" msgstr "C_MYK" -#: ../plug-ins/common/newsprint.c:1377 +#: ../plug-ins/common/newsprint.c:1378 msgid "I_ntensity" msgstr "_Интенсивность" -#: ../plug-ins/common/newsprint.c:1402 +#: ../plug-ins/common/newsprint.c:1403 msgid "_Lock channels" msgstr "_Фиксировать каналы" -#: ../plug-ins/common/newsprint.c:1415 +#: ../plug-ins/common/newsprint.c:1416 msgid "_Factory Defaults" msgstr "_По умолчанию" #. anti-alias control -#: ../plug-ins/common/newsprint.c:1441 ../plug-ins/gfig/gfig-dialog.c:1255 +#: ../plug-ins/common/newsprint.c:1442 ../plug-ins/gfig/gfig-dialog.c:1256 msgid "Antialiasing" msgstr "Сглаживание" -#: ../plug-ins/common/newsprint.c:1449 +#: ../plug-ins/common/newsprint.c:1450 msgid "O_versample:" msgstr "П_ерекрывание:" @@ -6149,23 +6154,23 @@ msgstr "_Нелинейный фильтр..." msgid "NL Filter" msgstr "Нелинейный фильтр" -#: ../plug-ins/common/nl-filter.c:1044 +#: ../plug-ins/common/nl-filter.c:1045 msgid "Filter" msgstr "Фильтр" -#: ../plug-ins/common/nl-filter.c:1048 +#: ../plug-ins/common/nl-filter.c:1049 msgid "_Alpha trimmed mean" msgstr "Альфа-усеченное среднее" -#: ../plug-ins/common/nl-filter.c:1050 +#: ../plug-ins/common/nl-filter.c:1051 msgid "Op_timal estimation" msgstr "Оптимальный расчет" -#: ../plug-ins/common/nl-filter.c:1052 +#: ../plug-ins/common/nl-filter.c:1053 msgid "_Edge enhancement" msgstr "Усиление края" -#: ../plug-ins/common/nl-filter.c:1077 +#: ../plug-ins/common/nl-filter.c:1078 msgid "A_lpha:" msgstr "_Альфа:" @@ -6181,11 +6186,11 @@ msgstr "Шум HSV..." msgid "HSV Noise" msgstr "Шум HSV" -#: ../plug-ins/common/noise-hsv.c:399 +#: ../plug-ins/common/noise-hsv.c:400 msgid "_Holdness:" msgstr "_Фиксированность:" -#: ../plug-ins/common/noise-hsv.c:411 +#: ../plug-ins/common/noise-hsv.c:412 msgid "H_ue:" msgstr "_Тон:" @@ -6225,24 +6230,24 @@ msgstr "Случайный _выбор..." msgid "_Slur..." msgstr "_Таяние..." -#: ../plug-ins/common/noise-randomize.c:770 -#: ../plug-ins/common/noise-solid.c:601 +#: ../plug-ins/common/noise-randomize.c:771 +#: ../plug-ins/common/noise-solid.c:602 msgid "_Random seed:" msgstr "_Случайное зерно:" -#: ../plug-ins/common/noise-randomize.c:779 +#: ../plug-ins/common/noise-randomize.c:780 msgid "R_andomization (%):" msgstr "С_лучайность (%):" -#: ../plug-ins/common/noise-randomize.c:782 +#: ../plug-ins/common/noise-randomize.c:783 msgid "Percentage of pixels to be filtered" msgstr "Процент фильтруемых пикселов" -#: ../plug-ins/common/noise-randomize.c:794 +#: ../plug-ins/common/noise-randomize.c:795 msgid "R_epeat:" msgstr "_Повторов:" -#: ../plug-ins/common/noise-randomize.c:797 +#: ../plug-ins/common/noise-randomize.c:798 msgid "Number of times to apply filter" msgstr "Число применений фильтра" @@ -6262,19 +6267,19 @@ msgstr "Добавление шума" msgid "RGB Noise" msgstr "Шум RGB" -#: ../plug-ins/common/noise-rgb.c:482 +#: ../plug-ins/common/noise-rgb.c:483 msgid "Co_rrelated noise" msgstr "_Корреляция шума" -#: ../plug-ins/common/noise-rgb.c:497 +#: ../plug-ins/common/noise-rgb.c:498 msgid "_Independent RGB" msgstr "_Независимые каналы RGB" -#: ../plug-ins/common/noise-rgb.c:521 ../plug-ins/common/noise-rgb.c:525 +#: ../plug-ins/common/noise-rgb.c:522 ../plug-ins/common/noise-rgb.c:526 msgid "_Gray:" msgstr "_Серый:" -#: ../plug-ins/common/noise-rgb.c:551 +#: ../plug-ins/common/noise-rgb.c:552 #, c-format msgid "Channel #%d:" msgstr "Канал #%d:" @@ -6292,25 +6297,25 @@ msgstr "_Сплошной шум..." msgid "Solid Noise" msgstr "Сплошной шум" -#: ../plug-ins/common/noise-solid.c:614 +#: ../plug-ins/common/noise-solid.c:615 msgid "_Detail:" msgstr "_Детализация:" #. Turbulent -#: ../plug-ins/common/noise-solid.c:624 +#: ../plug-ins/common/noise-solid.c:625 msgid "T_urbulent" msgstr "_Турбулентный" #. Tilable -#: ../plug-ins/common/noise-solid.c:638 +#: ../plug-ins/common/noise-solid.c:639 msgid "T_ilable" msgstr "_Мозаичный" -#: ../plug-ins/common/noise-solid.c:653 +#: ../plug-ins/common/noise-solid.c:654 msgid "_X size:" msgstr "Размер по _Х:" -#: ../plug-ins/common/noise-solid.c:666 +#: ../plug-ins/common/noise-solid.c:667 msgid "_Y size:" msgstr "Размер по _Y:" @@ -6326,11 +6331,11 @@ msgstr "_Рассеивание..." msgid "Spreading" msgstr "Применяется рассеивание..." -#: ../plug-ins/common/noise-spread.c:341 +#: ../plug-ins/common/noise-spread.c:343 msgid "Spread" msgstr "Рассеять" -#: ../plug-ins/common/noise-spread.c:366 +#: ../plug-ins/common/noise-spread.c:369 msgid "Spread Amount" msgstr "Степень рассеивания" @@ -6350,19 +6355,19 @@ msgstr "Визуализация Сверхновой" msgid "Supernova" msgstr "Сверхновая" -#: ../plug-ins/common/nova.c:348 +#: ../plug-ins/common/nova.c:349 msgid "Supernova Color Picker" msgstr "Пипетка цвета Сверхновой" -#: ../plug-ins/common/nova.c:377 +#: ../plug-ins/common/nova.c:378 msgid "_Spokes:" msgstr "_Лучей:" -#: ../plug-ins/common/nova.c:392 +#: ../plug-ins/common/nova.c:393 msgid "R_andom hue:" msgstr "С_лучайный тон:" -#: ../plug-ins/common/nova.c:445 +#: ../plug-ins/common/nova.c:446 msgid "Center of Nova" msgstr "Центр Сверхновой" @@ -6382,32 +6387,32 @@ msgstr "Рисование маслом" msgid "Oilify" msgstr "Масляная краска" -#: ../plug-ins/common/oilify.c:814 +#: ../plug-ins/common/oilify.c:815 msgid "_Mask size:" msgstr "Размер маски:" #. #. * Mask-size map check button #. -#: ../plug-ins/common/oilify.c:829 +#: ../plug-ins/common/oilify.c:830 msgid "Use m_ask-size map:" msgstr "Использовать к_арту размером с маску:" -#: ../plug-ins/common/oilify.c:866 ../plug-ins/common/sinus.c:921 +#: ../plug-ins/common/oilify.c:867 ../plug-ins/common/sinus.c:921 msgid "_Exponent:" msgstr "_Экспонента:" #. #. * Exponent map check button #. -#: ../plug-ins/common/oilify.c:881 +#: ../plug-ins/common/oilify.c:882 msgid "Use e_xponent map:" msgstr "Использовать карту _экспоненты:" #. #. * Intensity algorithm check button #. -#: ../plug-ins/common/oilify.c:917 +#: ../plug-ins/common/oilify.c:918 msgid "_Use intensity algorithm" msgstr "_Использовать алгоритм интенсивности" @@ -6424,16 +6429,16 @@ msgstr "_Фотокопия..." msgid "Photocopy" msgstr "Фотокопия" -#: ../plug-ins/common/photocopy.c:889 ../plug-ins/common/sharpen.c:510 -#: ../plug-ins/common/softglow.c:696 +#: ../plug-ins/common/photocopy.c:890 ../plug-ins/common/sharpen.c:511 +#: ../plug-ins/common/softglow.c:697 msgid "_Sharpness:" msgstr "_Резкость:" -#: ../plug-ins/common/photocopy.c:903 +#: ../plug-ins/common/photocopy.c:904 msgid "Percent _black:" msgstr "Процент _чёрного:" -#: ../plug-ins/common/photocopy.c:917 +#: ../plug-ins/common/photocopy.c:918 msgid "Percent _white:" msgstr "Процент _белого:" @@ -6453,11 +6458,11 @@ msgstr "Пикселизация" msgid "Pixelize" msgstr "Пикселизация" -#: ../plug-ins/common/pixelize.c:351 +#: ../plug-ins/common/pixelize.c:352 msgid "Pixel _width:" msgstr "_Ширина точки:" -#: ../plug-ins/common/pixelize.c:356 +#: ../plug-ins/common/pixelize.c:357 msgid "Pixel _height:" msgstr "_Высота точки:" @@ -6473,11 +6478,11 @@ msgstr "_Плазма..." msgid "Plasma" msgstr "Плазма" -#: ../plug-ins/common/plasma.c:336 +#: ../plug-ins/common/plasma.c:337 msgid "Random _seed:" msgstr "Случайное зерно:" -#: ../plug-ins/common/plasma.c:347 +#: ../plug-ins/common/plasma.c:348 msgid "T_urbulence:" msgstr "Т_урбулентность:" @@ -6564,19 +6569,19 @@ msgstr "Полярные координаты" msgid "Polar Coordinates" msgstr "Полярные координаты" -#: ../plug-ins/common/polar-coords.c:631 +#: ../plug-ins/common/polar-coords.c:632 msgid "Circle _depth in percent:" msgstr "_Глубина круга в процентах:" -#: ../plug-ins/common/polar-coords.c:643 +#: ../plug-ins/common/polar-coords.c:644 msgid "Offset _angle:" msgstr "_Угол смещения:" -#: ../plug-ins/common/polar-coords.c:658 +#: ../plug-ins/common/polar-coords.c:659 msgid "_Map backwards" msgstr "_Развернуть" -#: ../plug-ins/common/polar-coords.c:664 +#: ../plug-ins/common/polar-coords.c:665 msgid "" "If checked the mapping will begin at the right side, as opposed to beginning " "at the left." @@ -6584,11 +6589,11 @@ msgstr "" "Если отмечено, отображение начнется с правой стороны, в противном случае - с " "левой." -#: ../plug-ins/common/polar-coords.c:675 +#: ../plug-ins/common/polar-coords.c:676 msgid "Map from _top" msgstr "Отобразить с_верху" -#: ../plug-ins/common/polar-coords.c:681 +#: ../plug-ins/common/polar-coords.c:682 msgid "" "If unchecked the mapping will put the bottom row in the middle and the top " "row on the outside. If checked it will be the opposite." @@ -6596,11 +6601,11 @@ msgstr "" "Если не отмечено, то нижняя часть будет помещена в центр, а\n" "верхняя - на внешнюю сторону. Если отмечено - то наоборот." -#: ../plug-ins/common/polar-coords.c:693 +#: ../plug-ins/common/polar-coords.c:694 msgid "To _polar" msgstr "В _полярное" -#: ../plug-ins/common/polar-coords.c:699 +#: ../plug-ins/common/polar-coords.c:700 msgid "" "If unchecked the image will be circularly mapped onto a rectangle. If " "checked the image will be mapped onto a circle." @@ -6656,22 +6661,22 @@ msgstr "Удалить эффект _красных глаз..." msgid "Red Eye Removal" msgstr "Удаление эффекта красных глаз" -#: ../plug-ins/common/red-eye-removal.c:169 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1007 +#: ../plug-ins/common/red-eye-removal.c:170 +#: ../plug-ins/common/unsharp-mask.c:892 ../plug-ins/common/wind.c:1008 #: ../plug-ins/imagemap/imap_preferences.c:440 #: ../plug-ins/map-object/map-object-ui.c:585 msgid "_Threshold:" msgstr "_Порог:" -#: ../plug-ins/common/red-eye-removal.c:175 +#: ../plug-ins/common/red-eye-removal.c:176 msgid "Threshold for the red eye color to remove." msgstr "Порог удаляемого цвета красных глаз" -#: ../plug-ins/common/red-eye-removal.c:180 +#: ../plug-ins/common/red-eye-removal.c:181 msgid "Manually selecting the eyes may improve the results." msgstr "Выделение области глаз может улучшить результат" -#: ../plug-ins/common/red-eye-removal.c:300 +#: ../plug-ins/common/red-eye-removal.c:301 msgid "Removing red eye" msgstr "Удалить эффект красных глаз" @@ -6691,41 +6696,41 @@ msgstr "Создание ряби" msgid "Ripple" msgstr "Создать рябь" -#: ../plug-ins/common/ripple.c:540 +#: ../plug-ins/common/ripple.c:541 msgid "_Retain tilability" msgstr "Сохранить _бесшовность" #. Edges toggle box -#: ../plug-ins/common/ripple.c:577 +#: ../plug-ins/common/ripple.c:578 msgid "Edges" msgstr "Края" -#: ../plug-ins/common/ripple.c:583 +#: ../plug-ins/common/ripple.c:584 msgid "_Blank" msgstr "О_чистить" #. Wave toggle box -#: ../plug-ins/common/ripple.c:605 +#: ../plug-ins/common/ripple.c:606 msgid "Wave Type" msgstr "Тип волны" -#: ../plug-ins/common/ripple.c:609 +#: ../plug-ins/common/ripple.c:610 msgid "Saw_tooth" msgstr "_Пилообразная" -#: ../plug-ins/common/ripple.c:610 +#: ../plug-ins/common/ripple.c:611 msgid "S_ine" msgstr "_Синус" -#: ../plug-ins/common/ripple.c:633 +#: ../plug-ins/common/ripple.c:634 msgid "_Period:" msgstr "_Период:" -#: ../plug-ins/common/ripple.c:646 +#: ../plug-ins/common/ripple.c:647 msgid "A_mplitude:" msgstr "_Амплитуда:" -#: ../plug-ins/common/ripple.c:659 +#: ../plug-ins/common/ripple.c:660 msgid "Phase _shift:" msgstr "Cдвиг по _фазе:" @@ -6961,15 +6966,15 @@ msgstr "Выполняется сдвиг" msgid "Shift" msgstr "Сдвиг" -#: ../plug-ins/common/shift.c:387 +#: ../plug-ins/common/shift.c:388 msgid "Shift _horizontally" msgstr "Горизонтальный сдвиг" -#: ../plug-ins/common/shift.c:390 +#: ../plug-ins/common/shift.c:391 msgid "Shift _vertically" msgstr "Вертикальный сдвиг" -#: ../plug-ins/common/shift.c:421 +#: ../plug-ins/common/shift.c:422 msgid "Shift _amount:" msgstr "Величина сдвига:" @@ -7114,7 +7119,7 @@ msgstr "Извлечение гладкой палитры" msgid "Smooth Palette" msgstr "Гладкая палитра" -#: ../plug-ins/common/smooth-palette.c:451 +#: ../plug-ins/common/smooth-palette.c:452 msgid "_Search depth:" msgstr "_Глубина поиска:" @@ -7130,7 +7135,7 @@ msgstr "_Рассеянный свет..." msgid "Softglow" msgstr "Рассеянный свет" -#: ../plug-ins/common/softglow.c:668 +#: ../plug-ins/common/softglow.c:669 msgid "_Glow radius:" msgstr "_Радиус свечения" @@ -7154,123 +7159,123 @@ msgstr "Применяется искрение..." msgid "Sparkle" msgstr "Искрение" -#: ../plug-ins/common/sparkle.c:372 +#: ../plug-ins/common/sparkle.c:373 msgid "Luminosity _threshold:" msgstr "Порог _яркости:" -#: ../plug-ins/common/sparkle.c:375 +#: ../plug-ins/common/sparkle.c:376 msgid "Adjust the luminosity threshold" msgstr "Подбор порога яркости" -#: ../plug-ins/common/sparkle.c:385 +#: ../plug-ins/common/sparkle.c:386 msgid "F_lare intensity:" msgstr "Интенсивность _вспышки:" -#: ../plug-ins/common/sparkle.c:388 +#: ../plug-ins/common/sparkle.c:389 msgid "Adjust the flare intensity" msgstr "Подбор интенсивности вспышки" -#: ../plug-ins/common/sparkle.c:398 +#: ../plug-ins/common/sparkle.c:399 msgid "_Spike length:" msgstr "Длина _лучей:" -#: ../plug-ins/common/sparkle.c:401 +#: ../plug-ins/common/sparkle.c:402 msgid "Adjust the spike length" msgstr "Подбор длины луча" -#: ../plug-ins/common/sparkle.c:411 +#: ../plug-ins/common/sparkle.c:412 msgid "Sp_ike points:" msgstr "_Число лучей:" -#: ../plug-ins/common/sparkle.c:414 +#: ../plug-ins/common/sparkle.c:415 msgid "Adjust the number of spikes" msgstr "Подбор числа лучей" -#: ../plug-ins/common/sparkle.c:424 +#: ../plug-ins/common/sparkle.c:425 msgid "Spi_ke angle (-1: random):" msgstr "Угол луча (-1: случайный):" -#: ../plug-ins/common/sparkle.c:427 +#: ../plug-ins/common/sparkle.c:428 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)" msgstr "Подбор угла луча (-1 означает выбор случайного угла)" -#: ../plug-ins/common/sparkle.c:438 +#: ../plug-ins/common/sparkle.c:439 msgid "Spik_e density:" msgstr "П_лотность луча:" -#: ../plug-ins/common/sparkle.c:441 +#: ../plug-ins/common/sparkle.c:442 msgid "Adjust the spike density" msgstr "Подбор плотности луча" -#: ../plug-ins/common/sparkle.c:451 +#: ../plug-ins/common/sparkle.c:452 msgid "Tr_ansparency:" msgstr "Полупрозра_чность:" -#: ../plug-ins/common/sparkle.c:454 +#: ../plug-ins/common/sparkle.c:455 msgid "Adjust the opacity of the spikes" msgstr "Подбор непрозрачности лучей" -#: ../plug-ins/common/sparkle.c:464 +#: ../plug-ins/common/sparkle.c:465 msgid "_Random hue:" msgstr "С_лучайный тон:" -#: ../plug-ins/common/sparkle.c:467 +#: ../plug-ins/common/sparkle.c:468 msgid "Adjust how much the hue should be changed randomly" msgstr "Подбор степени случайного изменения тона" -#: ../plug-ins/common/sparkle.c:477 +#: ../plug-ins/common/sparkle.c:478 msgid "Rando_m saturation:" msgstr "Случайная нас_ыщенность:" -#: ../plug-ins/common/sparkle.c:480 +#: ../plug-ins/common/sparkle.c:481 msgid "Adjust how much the saturation should be changed randomly" msgstr "Подбор степени случайного изменения насыщенности" -#: ../plug-ins/common/sparkle.c:497 +#: ../plug-ins/common/sparkle.c:498 msgid "_Preserve luminosity" msgstr "Со_хранять яркость" -#: ../plug-ins/common/sparkle.c:504 +#: ../plug-ins/common/sparkle.c:505 msgid "Should the luminosity be preserved?" msgstr "Нужно ли сохранять яркость?" -#: ../plug-ins/common/sparkle.c:513 +#: ../plug-ins/common/sparkle.c:514 msgid "In_verse" msgstr "_Инвертировать" -#: ../plug-ins/common/sparkle.c:519 +#: ../plug-ins/common/sparkle.c:520 msgid "Should the effect be inversed?" msgstr "Нужно ли инвертировать эффект?" -#: ../plug-ins/common/sparkle.c:528 +#: ../plug-ins/common/sparkle.c:529 msgid "A_dd border" msgstr "_Добавить рамку" -#: ../plug-ins/common/sparkle.c:534 +#: ../plug-ins/common/sparkle.c:535 msgid "Draw a border of spikes around the image" msgstr "Нарисовать рамку из лучей вокруг изображения" -#: ../plug-ins/common/sparkle.c:548 +#: ../plug-ins/common/sparkle.c:549 msgid "_Natural color" msgstr "_Естественный цвет" -#: ../plug-ins/common/sparkle.c:549 +#: ../plug-ins/common/sparkle.c:550 msgid "_Foreground color" msgstr "Цвет _переднего плана" -#: ../plug-ins/common/sparkle.c:550 +#: ../plug-ins/common/sparkle.c:551 msgid "_Background color" msgstr "Цвет _фона" -#: ../plug-ins/common/sparkle.c:557 +#: ../plug-ins/common/sparkle.c:558 msgid "Use the color of the image" msgstr "Использовать цвет изображения" -#: ../plug-ins/common/sparkle.c:558 +#: ../plug-ins/common/sparkle.c:559 msgid "Use the foreground color" msgstr "Использовать цвет переднего плана" -#: ../plug-ins/common/sparkle.c:559 +#: ../plug-ins/common/sparkle.c:560 msgid "Use the background color" msgstr "Использовать цвет фона" @@ -7312,7 +7317,7 @@ msgid "Spots" msgstr "Пятна" #: ../plug-ins/common/sphere-designer.c:1741 -#: ../plug-ins/common/sphere-designer.c:2689 +#: ../plug-ins/common/sphere-designer.c:2690 msgid "Texture" msgstr "Текстура" @@ -7321,7 +7326,7 @@ msgid "Bumpmap" msgstr "Рельеф" #: ../plug-ins/common/sphere-designer.c:1745 -#: ../plug-ins/common/sphere-designer.c:2691 +#: ../plug-ins/common/sphere-designer.c:2692 msgid "Light" msgstr "Свет" @@ -7342,106 +7347,106 @@ msgstr "Сохранить файл" msgid "Sphere Designer" msgstr "Создание сферы" -#: ../plug-ins/common/sphere-designer.c:2674 +#: ../plug-ins/common/sphere-designer.c:2675 msgid "Properties" msgstr "Сво_йства" -#: ../plug-ins/common/sphere-designer.c:2690 +#: ../plug-ins/common/sphere-designer.c:2691 msgid "Bump" msgstr "Рельеф" #. row labels -#: ../plug-ins/common/sphere-designer.c:2698 +#: ../plug-ins/common/sphere-designer.c:2699 #: ../plug-ins/lighting/lighting-ui.c:404 msgid "Type:" msgstr "Тип:" -#: ../plug-ins/common/sphere-designer.c:2717 +#: ../plug-ins/common/sphere-designer.c:2718 msgid "Texture:" msgstr "Текстура:" -#: ../plug-ins/common/sphere-designer.c:2722 +#: ../plug-ins/common/sphere-designer.c:2723 msgid "Colors:" msgstr "Цвета:" -#: ../plug-ins/common/sphere-designer.c:2725 -#: ../plug-ins/common/sphere-designer.c:2736 +#: ../plug-ins/common/sphere-designer.c:2726 +#: ../plug-ins/common/sphere-designer.c:2737 msgid "Color Selection Dialog" msgstr "Диалог выбора цвета" #. Scale -#: ../plug-ins/common/sphere-designer.c:2747 +#: ../plug-ins/common/sphere-designer.c:2748 #: ../plug-ins/gimpressionist/paper.c:193 #: ../plug-ins/ifs-compose/ifs-compose.c:553 msgid "Scale:" msgstr "Масштаб:" -#: ../plug-ins/common/sphere-designer.c:2755 +#: ../plug-ins/common/sphere-designer.c:2756 msgid "Turbulence:" msgstr "Турбулентность:" -#: ../plug-ins/common/sphere-designer.c:2762 +#: ../plug-ins/common/sphere-designer.c:2763 msgid "Amount:" msgstr "Прозрачность:" -#: ../plug-ins/common/sphere-designer.c:2769 +#: ../plug-ins/common/sphere-designer.c:2770 msgid "Exp.:" msgstr "Экспонента:" -#: ../plug-ins/common/sphere-designer.c:2776 +#: ../plug-ins/common/sphere-designer.c:2777 msgid "Transformations" msgstr "Преобразования" -#: ../plug-ins/common/sphere-designer.c:2792 +#: ../plug-ins/common/sphere-designer.c:2793 #: ../plug-ins/map-object/map-object-ui.c:1143 msgid "Scale X:" msgstr "Масштаб X:" -#: ../plug-ins/common/sphere-designer.c:2799 +#: ../plug-ins/common/sphere-designer.c:2800 msgid "Scale Y:" msgstr "Масштаб Y:" -#: ../plug-ins/common/sphere-designer.c:2805 +#: ../plug-ins/common/sphere-designer.c:2806 msgid "Scale Z:" msgstr "Масштаб Z:" -#: ../plug-ins/common/sphere-designer.c:2812 +#: ../plug-ins/common/sphere-designer.c:2813 msgid "Rotate X:" msgstr "Вращение по X:" -#: ../plug-ins/common/sphere-designer.c:2819 +#: ../plug-ins/common/sphere-designer.c:2820 msgid "Rotate Y:" msgstr "Вращение по Y:" -#: ../plug-ins/common/sphere-designer.c:2826 +#: ../plug-ins/common/sphere-designer.c:2827 msgid "Rotate Z:" msgstr "Вращение по Z:" -#: ../plug-ins/common/sphere-designer.c:2833 +#: ../plug-ins/common/sphere-designer.c:2834 msgid "Position X:" msgstr "Позиция X:" -#: ../plug-ins/common/sphere-designer.c:2840 +#: ../plug-ins/common/sphere-designer.c:2841 msgid "Position Y:" msgstr "Позиция Y:" -#: ../plug-ins/common/sphere-designer.c:2847 +#: ../plug-ins/common/sphere-designer.c:2848 msgid "Position Z:" msgstr "Позиция Z:" -#: ../plug-ins/common/sphere-designer.c:2962 +#: ../plug-ins/common/sphere-designer.c:2963 msgid "Rendering sphere" msgstr "Визуализация сферы" -#: ../plug-ins/common/sphere-designer.c:3012 +#: ../plug-ins/common/sphere-designer.c:3013 msgid "Create an image of a textured sphere" msgstr "Создать сферу с заданной текстурой" -#: ../plug-ins/common/sphere-designer.c:3019 +#: ../plug-ins/common/sphere-designer.c:3020 msgid "Sphere _Designer..." msgstr "_Создание сферы..." -#: ../plug-ins/common/sphere-designer.c:3073 +#: ../plug-ins/common/sphere-designer.c:3074 msgid "Region selected for plug-in is empty" msgstr "Выбранная для расширения область пуста" @@ -7469,7 +7474,7 @@ msgstr "Рисование прозрачности" msgid "Threshold Alpha" msgstr "Порог альфа-канала" -#: ../plug-ins/common/threshold-alpha.c:282 +#: ../plug-ins/common/threshold-alpha.c:283 msgid "Threshold:" msgstr "Порог:" @@ -7487,87 +7492,87 @@ msgstr "_Стеклянные блоки..." msgid "Glass Tile" msgstr "Стеклянные блоки" -#: ../plug-ins/common/tile-glass.c:288 +#: ../plug-ins/common/tile-glass.c:289 msgid "Tile _width:" msgstr "_Ширина блока:" -#: ../plug-ins/common/tile-paper.c:242 ../plug-ins/common/tile-paper.c:555 +#: ../plug-ins/common/tile-paper.c:242 ../plug-ins/common/tile-paper.c:556 msgid "Paper Tile" msgstr "Разрез бумаги" -#: ../plug-ins/common/tile-paper.c:268 +#: ../plug-ins/common/tile-paper.c:269 msgid "Division" msgstr "Сегменты" -#: ../plug-ins/common/tile-paper.c:318 +#: ../plug-ins/common/tile-paper.c:319 msgid "Fractional Pixels" msgstr "Дробные пикселы" -#: ../plug-ins/common/tile-paper.c:323 +#: ../plug-ins/common/tile-paper.c:324 msgid "_Background" msgstr "Фон" -#: ../plug-ins/common/tile-paper.c:325 +#: ../plug-ins/common/tile-paper.c:326 msgid "_Ignore" msgstr "Игнорировать" -#: ../plug-ins/common/tile-paper.c:327 +#: ../plug-ins/common/tile-paper.c:328 msgid "_Force" msgstr "Усиливать" -#: ../plug-ins/common/tile-paper.c:334 +#: ../plug-ins/common/tile-paper.c:335 msgid "C_entering" msgstr "Центрирование" -#: ../plug-ins/common/tile-paper.c:349 +#: ../plug-ins/common/tile-paper.c:350 msgid "Movement" msgstr "Движение" -#: ../plug-ins/common/tile-paper.c:362 +#: ../plug-ins/common/tile-paper.c:363 msgid "_Max (%):" msgstr "Макс.(%):" -#: ../plug-ins/common/tile-paper.c:368 +#: ../plug-ins/common/tile-paper.c:369 msgid "_Wrap around" msgstr "Бесшовное изображение" -#: ../plug-ins/common/tile-paper.c:378 +#: ../plug-ins/common/tile-paper.c:379 msgid "Background Type" msgstr "Тип фона" -#: ../plug-ins/common/tile-paper.c:385 +#: ../plug-ins/common/tile-paper.c:386 msgid "I_nverted image" msgstr "Инвертированное изображение" -#: ../plug-ins/common/tile-paper.c:387 +#: ../plug-ins/common/tile-paper.c:388 msgid "Im_age" msgstr "Изображение" -#: ../plug-ins/common/tile-paper.c:389 +#: ../plug-ins/common/tile-paper.c:390 msgid "Fo_reground color" msgstr "Цвет _переднего плана" -#: ../plug-ins/common/tile-paper.c:391 +#: ../plug-ins/common/tile-paper.c:392 msgid "Bac_kground color" msgstr "Цвет _фона" -#: ../plug-ins/common/tile-paper.c:393 +#: ../plug-ins/common/tile-paper.c:394 msgid "S_elect here:" msgstr "Вы_брать:" -#: ../plug-ins/common/tile-paper.c:400 +#: ../plug-ins/common/tile-paper.c:401 msgid "Background Color" msgstr "Цвет фона" -#: ../plug-ins/common/tile-paper.c:845 +#: ../plug-ins/common/tile-paper.c:846 msgid "Cut image into paper tiles, and slide them" msgstr "Разрезать изображение на части и сдвинуть их относительно друг друга" -#: ../plug-ins/common/tile-paper.c:850 +#: ../plug-ins/common/tile-paper.c:851 msgid "September 31, 1999" msgstr "Сентябрь 31, 1999" -#: ../plug-ins/common/tile-paper.c:851 +#: ../plug-ins/common/tile-paper.c:852 msgid "_Paper Tile..." msgstr "_Разрез бумаги..." @@ -7653,11 +7658,11 @@ msgstr "_Черепица..." msgid "Tile" msgstr "Черепица" -#: ../plug-ins/common/tile.c:421 +#: ../plug-ins/common/tile.c:422 msgid "Tile to New Size" msgstr "Размер покрываемой площади" -#: ../plug-ins/common/tile.c:443 +#: ../plug-ins/common/tile.c:444 msgid "C_reate new image" msgstr "_Создать новое изображение" @@ -7892,43 +7897,43 @@ msgid "Value Propagate" msgstr "Распространение яркости" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1154 +#: ../plug-ins/common/value-propagate.c:1155 msgid "Propagate" msgstr "Распространение" -#: ../plug-ins/common/value-propagate.c:1167 +#: ../plug-ins/common/value-propagate.c:1168 msgid "Lower t_hreshold:" msgstr "_Нижний порог:" -#: ../plug-ins/common/value-propagate.c:1179 +#: ../plug-ins/common/value-propagate.c:1180 msgid "_Upper threshold:" msgstr "_Верхний порог:" -#: ../plug-ins/common/value-propagate.c:1191 +#: ../plug-ins/common/value-propagate.c:1192 msgid "_Propagating rate:" msgstr "_Скорость распространения:" -#: ../plug-ins/common/value-propagate.c:1202 +#: ../plug-ins/common/value-propagate.c:1203 msgid "To l_eft" msgstr "Н_алево" -#: ../plug-ins/common/value-propagate.c:1205 +#: ../plug-ins/common/value-propagate.c:1206 msgid "To _right" msgstr "На_право" -#: ../plug-ins/common/value-propagate.c:1208 +#: ../plug-ins/common/value-propagate.c:1209 msgid "To _top" msgstr "Вв_ерх" -#: ../plug-ins/common/value-propagate.c:1211 +#: ../plug-ins/common/value-propagate.c:1212 msgid "To _bottom" msgstr "Вн_из" -#: ../plug-ins/common/value-propagate.c:1220 +#: ../plug-ins/common/value-propagate.c:1221 msgid "Propagating _alpha channel" msgstr "Распространение а_льфа-канала" -#: ../plug-ins/common/value-propagate.c:1231 +#: ../plug-ins/common/value-propagate.c:1232 msgid "Propagating value channel" msgstr "Распространение канала _яркости" @@ -7936,67 +7941,67 @@ msgstr "Распространение канала _яркости" msgid "Van Gogh (LIC)" msgstr "Ван Гог (LIC)" -#: ../plug-ins/common/van-gogh-lic.c:665 +#: ../plug-ins/common/van-gogh-lic.c:666 msgid "Effect Channel" msgstr "Канал эффекта" -#: ../plug-ins/common/van-gogh-lic.c:672 +#: ../plug-ins/common/van-gogh-lic.c:673 msgid "_Brightness" msgstr "Яркость" -#: ../plug-ins/common/van-gogh-lic.c:678 +#: ../plug-ins/common/van-gogh-lic.c:679 msgid "Effect Operator" msgstr "Оператор эффекта" -#: ../plug-ins/common/van-gogh-lic.c:683 +#: ../plug-ins/common/van-gogh-lic.c:684 msgid "_Derivative" msgstr "Производная" -#: ../plug-ins/common/van-gogh-lic.c:684 +#: ../plug-ins/common/van-gogh-lic.c:685 msgid "_Gradient" msgstr "Градиент" -#: ../plug-ins/common/van-gogh-lic.c:690 +#: ../plug-ins/common/van-gogh-lic.c:691 msgid "Convolve" msgstr "Свертка" -#: ../plug-ins/common/van-gogh-lic.c:695 +#: ../plug-ins/common/van-gogh-lic.c:696 msgid "_With white noise" msgstr "С белым шумом" -#: ../plug-ins/common/van-gogh-lic.c:696 +#: ../plug-ins/common/van-gogh-lic.c:697 msgid "W_ith source image" msgstr "С исходным изображением" -#: ../plug-ins/common/van-gogh-lic.c:715 +#: ../plug-ins/common/van-gogh-lic.c:716 msgid "_Effect image:" msgstr "Изображение эффекта:" -#: ../plug-ins/common/van-gogh-lic.c:726 +#: ../plug-ins/common/van-gogh-lic.c:727 msgid "_Filter length:" msgstr "Длина фильтра:" -#: ../plug-ins/common/van-gogh-lic.c:735 +#: ../plug-ins/common/van-gogh-lic.c:736 msgid "_Noise magnitude:" msgstr "Величина шума:" -#: ../plug-ins/common/van-gogh-lic.c:744 +#: ../plug-ins/common/van-gogh-lic.c:745 msgid "In_tegration steps:" msgstr "Интеграционные шаги:" -#: ../plug-ins/common/van-gogh-lic.c:753 +#: ../plug-ins/common/van-gogh-lic.c:754 msgid "_Minimum value:" msgstr "Минимальное значение:" -#: ../plug-ins/common/van-gogh-lic.c:762 +#: ../plug-ins/common/van-gogh-lic.c:763 msgid "M_aximum value:" msgstr "_Максимальное значение:" -#: ../plug-ins/common/van-gogh-lic.c:808 +#: ../plug-ins/common/van-gogh-lic.c:809 msgid "Special effects that nobody understands" msgstr "Специальные эффекты, смысл которых никому не известен" -#: ../plug-ins/common/van-gogh-lic.c:813 +#: ../plug-ins/common/van-gogh-lic.c:814 msgid "_Van Gogh (LIC)..." msgstr "_Ван Гог (LIC)..." @@ -8049,15 +8054,15 @@ msgid "Video" msgstr "Видео" #. frame for the radio buttons -#: ../plug-ins/common/video.c:2038 +#: ../plug-ins/common/video.c:2039 msgid "Video Pattern" msgstr "Шаблон видео" -#: ../plug-ins/common/video.c:2082 +#: ../plug-ins/common/video.c:2083 msgid "_Additive" msgstr "Допол_няющий" -#: ../plug-ins/common/video.c:2092 +#: ../plug-ins/common/video.c:2093 msgid "_Rotated" msgstr "По_вёрнутый" @@ -8073,117 +8078,117 @@ msgstr "_Деформация..." msgid "Warp" msgstr "Деформация" -#: ../plug-ins/common/warp.c:396 +#: ../plug-ins/common/warp.c:397 msgid "Basic Options" msgstr "Основные параметры" -#: ../plug-ins/common/warp.c:418 +#: ../plug-ins/common/warp.c:419 msgid "Step size:" msgstr "Размер шага:" -#: ../plug-ins/common/warp.c:432 +#: ../plug-ins/common/warp.c:433 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:769 #: ../plug-ins/ifs-compose/ifs-compose.c:1211 msgid "Iterations:" msgstr "Число повторов:" #. Displacement map menu -#: ../plug-ins/common/warp.c:441 +#: ../plug-ins/common/warp.c:442 msgid "Displacement map:" msgstr "Карта замещения:" #. ======================================================================= #. Displacement Type -#: ../plug-ins/common/warp.c:459 +#: ../plug-ins/common/warp.c:460 msgid "On edges:" msgstr "На краях:" -#: ../plug-ins/common/warp.c:470 +#: ../plug-ins/common/warp.c:471 msgid "Wrap" msgstr "Заворачивать" -#: ../plug-ins/common/warp.c:485 +#: ../plug-ins/common/warp.c:486 msgid "Smear" msgstr "Размазывать" -#: ../plug-ins/common/warp.c:500 ../plug-ins/file-fits/fits.c:1020 -#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1459 +#: ../plug-ins/common/warp.c:501 ../plug-ins/file-fits/fits.c:1020 +#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1461 msgid "Black" msgstr "Черный" -#: ../plug-ins/common/warp.c:515 +#: ../plug-ins/common/warp.c:516 msgid "Foreground color" msgstr "Цвет переднего плана" #. -------------------------------------------------------------------- #. --------- The secondary table -------------------------- -#: ../plug-ins/common/warp.c:535 +#: ../plug-ins/common/warp.c:536 msgid "Advanced Options" msgstr "Дополнительные параметры" -#: ../plug-ins/common/warp.c:551 +#: ../plug-ins/common/warp.c:552 msgid "Dither size:" msgstr "Размер смешения:" -#: ../plug-ins/common/warp.c:564 +#: ../plug-ins/common/warp.c:565 msgid "Rotation angle:" msgstr "Угол поворота:" -#: ../plug-ins/common/warp.c:577 +#: ../plug-ins/common/warp.c:578 msgid "Substeps:" msgstr "Подшагов:" #. Magnitude map menu -#: ../plug-ins/common/warp.c:586 +#: ../plug-ins/common/warp.c:587 msgid "Magnitude map:" msgstr "Карта значений:" -#: ../plug-ins/common/warp.c:608 +#: ../plug-ins/common/warp.c:609 msgid "Use magnitude map" msgstr "Использовать карту значений:" #. -------------------------------------------------------------------- #. --------- The "other" table -------------------------- -#: ../plug-ins/common/warp.c:621 +#: ../plug-ins/common/warp.c:622 msgid "More Advanced Options" msgstr "Другие параметры" -#: ../plug-ins/common/warp.c:638 +#: ../plug-ins/common/warp.c:639 msgid "Gradient scale:" msgstr "Масштаб градиента:" -#: ../plug-ins/common/warp.c:657 +#: ../plug-ins/common/warp.c:658 msgid "Gradient map selection menu" msgstr "Меню выбора градиентной карты" -#: ../plug-ins/common/warp.c:667 +#: ../plug-ins/common/warp.c:668 msgid "Vector mag:" msgstr "Длина вектора:" #. Angle -#: ../plug-ins/common/warp.c:682 ../plug-ins/ifs-compose/ifs-compose.c:567 +#: ../plug-ins/common/warp.c:683 ../plug-ins/ifs-compose/ifs-compose.c:567 msgid "Angle:" msgstr "Угол:" -#: ../plug-ins/common/warp.c:701 +#: ../plug-ins/common/warp.c:702 msgid "Fixed-direction-vector map selection menu" msgstr "Меню выбора карты векторов с фикс.направлениями" #. make sure layer is visible -#: ../plug-ins/common/warp.c:1177 +#: ../plug-ins/common/warp.c:1178 msgid "Smoothing X gradient" msgstr "Сглаживание Х градиента..." -#: ../plug-ins/common/warp.c:1180 +#: ../plug-ins/common/warp.c:1181 msgid "Smoothing Y gradient" msgstr "Сглаживание Y градиента..." #. calculate new X,Y Displacement image maps -#: ../plug-ins/common/warp.c:1230 +#: ../plug-ins/common/warp.c:1231 msgid "Finding XY gradient" msgstr "Поиск XY градиента..." -#: ../plug-ins/common/warp.c:1255 +#: ../plug-ins/common/warp.c:1256 #, c-format msgid "Flow step %d" msgstr "Шаг %d" @@ -8200,23 +8205,23 @@ msgstr "Во_лны..." msgid "Waves" msgstr "Волны" -#: ../plug-ins/common/waves.c:294 +#: ../plug-ins/common/waves.c:295 msgid "_Reflective" msgstr "Отра_жающиеся волны" -#: ../plug-ins/common/waves.c:313 +#: ../plug-ins/common/waves.c:314 msgid "_Amplitude:" msgstr "_Амплитуда:" -#: ../plug-ins/common/waves.c:325 +#: ../plug-ins/common/waves.c:326 msgid "_Phase:" msgstr "_Фаза:" -#: ../plug-ins/common/waves.c:337 +#: ../plug-ins/common/waves.c:338 msgid "_Wavelength:" msgstr "_Длина волны:" -#: ../plug-ins/common/waves.c:448 +#: ../plug-ins/common/waves.c:449 msgid "Waving" msgstr "Создание волн" @@ -8268,11 +8273,11 @@ msgstr "Создание вихрей и щипков" msgid "Whirl and Pinch" msgstr "Вихрь и щипок" -#: ../plug-ins/common/whirl-pinch.c:564 +#: ../plug-ins/common/whirl-pinch.c:565 msgid "_Whirl angle:" msgstr "_Угол вихря:" -#: ../plug-ins/common/whirl-pinch.c:576 +#: ../plug-ins/common/whirl-pinch.c:577 msgid "_Pinch amount:" msgstr "_Величина щипка:" @@ -8299,54 +8304,54 @@ msgstr "Ветер" #. ******************************************************** #. radio buttons for choosing wind rendering algorithm #. ***************************************************** -#: ../plug-ins/common/wind.c:920 +#: ../plug-ins/common/wind.c:921 msgid "Style" msgstr "Стиль" -#: ../plug-ins/common/wind.c:924 +#: ../plug-ins/common/wind.c:925 msgid "_Wind" msgstr "_Ветер" -#: ../plug-ins/common/wind.c:925 +#: ../plug-ins/common/wind.c:926 msgid "_Blast" msgstr "_Порыв ветра" -#: ../plug-ins/common/wind.c:948 +#: ../plug-ins/common/wind.c:949 msgid "_Left" msgstr "С_лева" -#: ../plug-ins/common/wind.c:949 +#: ../plug-ins/common/wind.c:950 msgid "_Right" msgstr "_Справа" #. **************************************************** #. radio buttons for choosing BOTH, LEADING, TRAILING #. ************************************************** -#: ../plug-ins/common/wind.c:968 +#: ../plug-ins/common/wind.c:969 msgid "Edge Affected" msgstr "Захватываются края" -#: ../plug-ins/common/wind.c:972 +#: ../plug-ins/common/wind.c:973 msgid "L_eading" msgstr "Передний" -#: ../plug-ins/common/wind.c:973 +#: ../plug-ins/common/wind.c:974 msgid "Tr_ailing" msgstr "Замыкающий" -#: ../plug-ins/common/wind.c:974 +#: ../plug-ins/common/wind.c:975 msgid "Bot_h" msgstr "Оба" -#: ../plug-ins/common/wind.c:1011 +#: ../plug-ins/common/wind.c:1012 msgid "Higher values restrict the effect to fewer areas of the image" msgstr "Повышение значений ограничивает эффект меньшими областями изображения" -#: ../plug-ins/common/wind.c:1026 ../plug-ins/gimpressionist/orientmap.c:693 +#: ../plug-ins/common/wind.c:1027 ../plug-ins/gimpressionist/orientmap.c:693 msgid "_Strength:" msgstr "Сила:" -#: ../plug-ins/common/wind.c:1030 +#: ../plug-ins/common/wind.c:1031 msgid "Higher values increase the magnitude of the effect" msgstr "Повышение значений усиливает эффект" @@ -8399,23 +8404,23 @@ msgstr "Альфа-канал будет проигнорирован." msgid "Save as BMP" msgstr "Сохранить как BMP" -#: ../plug-ins/file-bmp/bmp-write.c:815 +#: ../plug-ins/file-bmp/bmp-write.c:816 msgid "_Run-Length Encoded" msgstr "_RLE-кодирование" -#: ../plug-ins/file-bmp/bmp-write.c:827 ../plug-ins/file-jpeg/jpeg-save.c:904 +#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:905 msgid "_Advanced Options" msgstr "_Дополнительные параметры" -#: ../plug-ins/file-bmp/bmp-write.c:842 +#: ../plug-ins/file-bmp/bmp-write.c:843 msgid "16 bits" msgstr "16 бит" -#: ../plug-ins/file-bmp/bmp-write.c:878 +#: ../plug-ins/file-bmp/bmp-write.c:879 msgid "24 bits" msgstr "24 бита" -#: ../plug-ins/file-bmp/bmp-write.c:895 +#: ../plug-ins/file-bmp/bmp-write.c:896 msgid "32 bits" msgstr "32 бита" @@ -8451,8 +8456,8 @@ msgstr "Загрузка файла в формате FITS" msgid "Replacement for undefined pixels" msgstr "Замещение для неопределенных пикселов" -#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1285 -#: ../plug-ins/gfig/gfig-dialog.c:1460 +#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1286 +#: ../plug-ins/gfig/gfig-dialog.c:1462 msgid "White" msgstr "Белый" @@ -8574,7 +8579,7 @@ msgstr "Размер файла: %s" msgid "Calculating file size..." msgstr "Рассчитывается размер файла..." -#: ../plug-ins/file-jpeg/jpeg-save.c:778 ../plug-ins/file-jpeg/jpeg-save.c:880 +#: ../plug-ins/file-jpeg/jpeg-save.c:778 ../plug-ins/file-jpeg/jpeg-save.c:881 msgid "File size: unknown" msgstr "Размер: неизвестен" @@ -8582,59 +8587,59 @@ msgstr "Размер: неизвестен" msgid "Save as JPEG" msgstr "Сохранить как JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:866 +#: ../plug-ins/file-jpeg/jpeg-save.c:867 msgid "_Quality:" msgstr "_Качество:" -#: ../plug-ins/file-jpeg/jpeg-save.c:870 +#: ../plug-ins/file-jpeg/jpeg-save.c:871 msgid "JPEG quality parameter" msgstr "Качество изображения JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:889 +#: ../plug-ins/file-jpeg/jpeg-save.c:890 msgid "Enable preview to obtain the file size." msgstr "Включите пред. просмотр, чтобы видеть размер файла." -#: ../plug-ins/file-jpeg/jpeg-save.c:892 +#: ../plug-ins/file-jpeg/jpeg-save.c:893 msgid "Sho_w preview in image window" msgstr "Просмотр _в окне изображения" -#: ../plug-ins/file-jpeg/jpeg-save.c:933 +#: ../plug-ins/file-jpeg/jpeg-save.c:934 msgid "S_moothing:" msgstr "Сг_лаживание:" -#: ../plug-ins/file-jpeg/jpeg-save.c:946 +#: ../plug-ins/file-jpeg/jpeg-save.c:947 msgid "Frequency (rows):" msgstr "Частота (строки):" -#: ../plug-ins/file-jpeg/jpeg-save.c:962 +#: ../plug-ins/file-jpeg/jpeg-save.c:963 msgid "Use _restart markers" msgstr "Использовать _маркеры перезапуска" -#: ../plug-ins/file-jpeg/jpeg-save.c:978 +#: ../plug-ins/file-jpeg/jpeg-save.c:979 msgid "_Optimize" msgstr "О_птимизировать" -#: ../plug-ins/file-jpeg/jpeg-save.c:992 +#: ../plug-ins/file-jpeg/jpeg-save.c:993 msgid "_Progressive" msgstr "Про_грессивная" -#: ../plug-ins/file-jpeg/jpeg-save.c:1008 +#: ../plug-ins/file-jpeg/jpeg-save.c:1009 msgid "Save _EXIF data" msgstr "Сохранить данные _Exif" -#: ../plug-ins/file-jpeg/jpeg-save.c:1025 +#: ../plug-ins/file-jpeg/jpeg-save.c:1026 msgid "Save _thumbnail" msgstr "Сохранить _эскиз" -#: ../plug-ins/file-jpeg/jpeg-save.c:1042 +#: ../plug-ins/file-jpeg/jpeg-save.c:1043 msgid "Save _XMP data" msgstr "Сохранить данные _XMP" -#: ../plug-ins/file-jpeg/jpeg-save.c:1057 +#: ../plug-ins/file-jpeg/jpeg-save.c:1058 msgid "_Use quality settings from original image" msgstr "Использовать _качественные характеристики исходного изображения" -#: ../plug-ins/file-jpeg/jpeg-save.c:1063 +#: ../plug-ins/file-jpeg/jpeg-save.c:1064 msgid "" "If the original image was loaded from a JPEG file using non-standard quality " "settings (quantization tables), enable this option to get almost the same " @@ -8645,48 +8650,48 @@ msgstr "" "параметр для получения максимально схожего качества и размера файла." #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1087 +#: ../plug-ins/file-jpeg/jpeg-save.c:1088 msgid "Su_bsampling:" msgstr "С_убвыборка:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1094 +#: ../plug-ins/file-jpeg/jpeg-save.c:1095 msgid "1x1,1x1,1x1 (best quality)" msgstr "1x1,1x1,1x1 (наилучшее качество)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1096 +#: ../plug-ins/file-jpeg/jpeg-save.c:1097 msgid "2x1,1x1,1x1 (4:2:2)" msgstr "2x1,1x1,1x1 (4:2:2)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1098 +#: ../plug-ins/file-jpeg/jpeg-save.c:1099 msgid "1x2,1x1,1x1" msgstr "1x2,1x1,1x1" -#: ../plug-ins/file-jpeg/jpeg-save.c:1100 +#: ../plug-ins/file-jpeg/jpeg-save.c:1101 msgid "2x2,1x1,1x1 (smallest file)" msgstr "2x2,1x1,1x1 (наименьший размер файла)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1130 +#: ../plug-ins/file-jpeg/jpeg-save.c:1131 msgid "_DCT method:" msgstr "_Метод DCT:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1136 +#: ../plug-ins/file-jpeg/jpeg-save.c:1137 msgid "Fast Integer" msgstr "Быстрое целое" -#: ../plug-ins/file-jpeg/jpeg-save.c:1137 +#: ../plug-ins/file-jpeg/jpeg-save.c:1138 msgid "Integer" msgstr "Целое" -#: ../plug-ins/file-jpeg/jpeg-save.c:1138 +#: ../plug-ins/file-jpeg/jpeg-save.c:1139 msgid "Floating-Point" msgstr "С плавающей точкой" -#: ../plug-ins/file-jpeg/jpeg-save.c:1154 +#: ../plug-ins/file-jpeg/jpeg-save.c:1155 msgid "Comment" msgstr "Комментарий" -#: ../plug-ins/file-jpeg/jpeg-save.c:1199 +#: ../plug-ins/file-jpeg/jpeg-save.c:1201 msgid "Sa_ve Defaults" msgstr "_Запомнить эти параметры" @@ -8957,33 +8962,33 @@ msgstr "Внимание: в XJT сохранена единица неподд msgid "Save as XJT" msgstr "Сохранить как XJT" -#: ../plug-ins/file-xjt/xjt.c:888 +#: ../plug-ins/file-xjt/xjt.c:889 msgid "Optimize" msgstr "Оптимизировать" -#: ../plug-ins/file-xjt/xjt.c:898 +#: ../plug-ins/file-xjt/xjt.c:899 msgid "Clear transparent" msgstr "Очистить прозрачное" -#: ../plug-ins/file-xjt/xjt.c:910 +#: ../plug-ins/file-xjt/xjt.c:911 msgid "Quality:" msgstr "Качество:" -#: ../plug-ins/file-xjt/xjt.c:919 +#: ../plug-ins/file-xjt/xjt.c:920 msgid "Smoothing:" msgstr "Сглаживание:" -#: ../plug-ins/file-xjt/xjt.c:1716 ../plug-ins/file-xjt/xjt.c:3353 +#: ../plug-ins/file-xjt/xjt.c:1717 ../plug-ins/file-xjt/xjt.c:3354 #, c-format msgid "Could not create working folder '%s': %s" msgstr "Невозможно создать рабочий каталог '%s': %s" -#: ../plug-ins/file-xjt/xjt.c:3219 +#: ../plug-ins/file-xjt/xjt.c:3220 #, c-format msgid "Error: Could not read XJT property file '%s'." msgstr "Ошибка: невозможно прочитать файл свойств XJT '%s'" -#: ../plug-ins/file-xjt/xjt.c:3226 +#: ../plug-ins/file-xjt/xjt.c:3227 #, c-format msgid "Error: XJT property file '%s' is empty." msgstr "Ошибка: файл свойств XJT '%s' пуст" @@ -9046,7 +9051,7 @@ msgstr "Вихрь" msgid "Horseshoe" msgstr "Подкова" -#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1441 +#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1443 msgid "Polar" msgstr "Полярность" @@ -9712,34 +9717,34 @@ msgid "This tool has no options" msgstr "У этого инструмента нет параметров" #. Put buttons in -#: ../plug-ins/gfig/gfig-dialog.c:1227 +#: ../plug-ins/gfig/gfig-dialog.c:1228 msgid "Show position" msgstr "Показывать позицию" -#: ../plug-ins/gfig/gfig-dialog.c:1239 +#: ../plug-ins/gfig/gfig-dialog.c:1240 msgid "Show control points" msgstr "Показывать контрольные точки" -#: ../plug-ins/gfig/gfig-dialog.c:1273 +#: ../plug-ins/gfig/gfig-dialog.c:1274 msgid "Max undo:" msgstr "Макс. отмен:" -#: ../plug-ins/gfig/gfig-dialog.c:1282 +#: ../plug-ins/gfig/gfig-dialog.c:1283 #: ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Прозрачный" -#: ../plug-ins/gfig/gfig-dialog.c:1284 +#: ../plug-ins/gfig/gfig-dialog.c:1285 msgid "Foreground" msgstr "Передний план" -#: ../plug-ins/gfig/gfig-dialog.c:1286 ../plug-ins/imagemap/imap_cmd_copy.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:1287 ../plug-ins/imagemap/imap_cmd_copy.c:53 #: ../plug-ins/imagemap/imap_cmd_copy_object.c:54 #: ../plug-ins/imagemap/imap_menu.c:159 msgid "Copy" msgstr "Скопировать" -#: ../plug-ins/gfig/gfig-dialog.c:1295 +#: ../plug-ins/gfig/gfig-dialog.c:1296 msgid "" "Layer background type. Copy causes the previous layer to be copied before " "the draw is performed." @@ -9747,80 +9752,80 @@ msgstr "" "Тип фона слоя. «Скопировать» будет вызывать копирование предыдущего слоя " "перед выполнением рисования." -#: ../plug-ins/gfig/gfig-dialog.c:1301 +#: ../plug-ins/gfig/gfig-dialog.c:1302 msgid "Background:" msgstr "Фон:" -#: ../plug-ins/gfig/gfig-dialog.c:1304 +#: ../plug-ins/gfig/gfig-dialog.c:1305 msgid "Feather" msgstr "Растушёвка" -#: ../plug-ins/gfig/gfig-dialog.c:1328 +#: ../plug-ins/gfig/gfig-dialog.c:1329 msgid "Radius:" msgstr "Радиус:" -#: ../plug-ins/gfig/gfig-dialog.c:1385 +#: ../plug-ins/gfig/gfig-dialog.c:1387 msgid "Grid spacing:" msgstr "Размер ячейки:" -#: ../plug-ins/gfig/gfig-dialog.c:1402 +#: ../plug-ins/gfig/gfig-dialog.c:1404 msgid "Polar grid sectors desired:" msgstr "Секторы полярной сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1424 +#: ../plug-ins/gfig/gfig-dialog.c:1426 msgid "Polar grid radius interval:" msgstr "Интервал радиусов пол. сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1440 ../plug-ins/imagemap/imap_menu.c:219 +#: ../plug-ins/gfig/gfig-dialog.c:1442 ../plug-ins/imagemap/imap_menu.c:219 msgid "Rectangle" msgstr "Прямоугольник" -#: ../plug-ins/gfig/gfig-dialog.c:1442 +#: ../plug-ins/gfig/gfig-dialog.c:1444 msgid "Isometric" msgstr "Изометрическая" -#: ../plug-ins/gfig/gfig-dialog.c:1451 +#: ../plug-ins/gfig/gfig-dialog.c:1453 msgid "Grid type:" msgstr "Тип сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1458 +#: ../plug-ins/gfig/gfig-dialog.c:1460 #: ../plug-ins/gradient-flare/gradient-flare.c:550 msgid "Normal" msgstr "Обычная" -#: ../plug-ins/gfig/gfig-dialog.c:1461 +#: ../plug-ins/gfig/gfig-dialog.c:1463 msgid "Grey" msgstr "Серый" -#: ../plug-ins/gfig/gfig-dialog.c:1462 +#: ../plug-ins/gfig/gfig-dialog.c:1464 msgid "Darker" msgstr "Темнее" -#: ../plug-ins/gfig/gfig-dialog.c:1463 +#: ../plug-ins/gfig/gfig-dialog.c:1465 msgid "Lighter" msgstr "Светлее" -#: ../plug-ins/gfig/gfig-dialog.c:1464 +#: ../plug-ins/gfig/gfig-dialog.c:1466 msgid "Very dark" msgstr "Очень тёмный" -#: ../plug-ins/gfig/gfig-dialog.c:1473 +#: ../plug-ins/gfig/gfig-dialog.c:1475 msgid "Grid color:" msgstr "Цвет сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1696 +#: ../plug-ins/gfig/gfig-dialog.c:1698 msgid "Sides:" msgstr "Стороны:" -#: ../plug-ins/gfig/gfig-dialog.c:1706 +#: ../plug-ins/gfig/gfig-dialog.c:1708 msgid "Right" msgstr "Справа" -#: ../plug-ins/gfig/gfig-dialog.c:1707 +#: ../plug-ins/gfig/gfig-dialog.c:1709 msgid "Left" msgstr "Слева" -#: ../plug-ins/gfig/gfig-dialog.c:1717 +#: ../plug-ins/gfig/gfig-dialog.c:1719 #: ../plug-ins/gimpressionist/orientation.c:147 msgid "Orientation:" msgstr "Ориентация:" @@ -10179,7 +10184,7 @@ msgstr "" "правой указывает вектор, щелчок средней — добавляет новый вектор." #: ../plug-ins/gimpressionist/orientmap.c:589 -#: ../plug-ins/gimpressionist/sizemap.c:458 +#: ../plug-ins/gimpressionist/sizemap.c:459 msgid "Adjust the preview's brightness" msgstr "Настроить яркость просмотра" @@ -10192,7 +10197,7 @@ msgid "Select next vector" msgstr "Выбрать следующий вектор" #: ../plug-ins/gimpressionist/orientmap.c:619 -#: ../plug-ins/gimpressionist/sizemap.c:489 +#: ../plug-ins/gimpressionist/sizemap.c:490 msgid "A_dd" msgstr "Добавить" @@ -10201,7 +10206,7 @@ msgid "Add new vector" msgstr "Добавить новый вектор" #: ../plug-ins/gimpressionist/orientmap.c:625 -#: ../plug-ins/gimpressionist/sizemap.c:496 +#: ../plug-ins/gimpressionist/sizemap.c:497 msgid "_Kill" msgstr "Удалить" @@ -10230,7 +10235,7 @@ msgid "Vortex_3" msgstr "Вихрь3" #: ../plug-ins/gimpressionist/orientmap.c:653 -#: ../plug-ins/gimpressionist/sizemap.c:541 +#: ../plug-ins/gimpressionist/sizemap.c:542 msgid "_Voronoi" msgstr "Вороной" @@ -10267,7 +10272,7 @@ msgid "S_trength exp.:" msgstr "Экспонента силы:" #: ../plug-ins/gimpressionist/orientmap.c:708 -#: ../plug-ins/gimpressionist/sizemap.c:536 +#: ../plug-ins/gimpressionist/sizemap.c:537 msgid "Change the exponent of the strength" msgstr "Изменить экспоненту силы:" @@ -10346,31 +10351,31 @@ msgstr "" msgid "Save Current" msgstr "Сохранить текущие" -#: ../plug-ins/gimpressionist/presets.c:893 +#: ../plug-ins/gimpressionist/presets.c:894 msgid "Gimpressionist Defaults" msgstr "Значения по умолчанию" -#: ../plug-ins/gimpressionist/presets.c:1014 +#: ../plug-ins/gimpressionist/presets.c:1015 msgid "_Presets" msgstr "Настройки" -#: ../plug-ins/gimpressionist/presets.c:1029 +#: ../plug-ins/gimpressionist/presets.c:1030 msgid "Save Current..." msgstr "Сохранить текущие..." -#: ../plug-ins/gimpressionist/presets.c:1037 +#: ../plug-ins/gimpressionist/presets.c:1038 msgid "Save the current settings to the specified file" msgstr "Сохранить текущие настройки в указанном файле" -#: ../plug-ins/gimpressionist/presets.c:1065 +#: ../plug-ins/gimpressionist/presets.c:1066 msgid "Reads the selected Preset into memory" msgstr "Считать выбранные настройки в память" -#: ../plug-ins/gimpressionist/presets.c:1071 +#: ../plug-ins/gimpressionist/presets.c:1072 msgid "Deletes the selected Preset" msgstr "Удалить выбранные настройки" -#: ../plug-ins/gimpressionist/presets.c:1077 +#: ../plug-ins/gimpressionist/presets.c:1078 msgid "Reread the folder of Presets" msgstr "Перечитать каталог настроек" @@ -10459,11 +10464,11 @@ msgstr "Открыть редактор карты размеров" msgid "Size Map Editor" msgstr "Редактор карты размеров" -#: ../plug-ins/gimpressionist/sizemap.c:428 +#: ../plug-ins/gimpressionist/sizemap.c:429 msgid "Smvectors" msgstr "Sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:438 +#: ../plug-ins/gimpressionist/sizemap.c:439 msgid "" "The smvector-field. Left-click to move selected smvector, Right-click to " "point it towards mouse, Middle-click to add a new smvector." @@ -10472,39 +10477,39 @@ msgstr "" "щелчок правой кнопкой - указание sm-вектора мышью, щелчок средней кнопкой - " "добавление нового sm-вектора." -#: ../plug-ins/gimpressionist/sizemap.c:480 +#: ../plug-ins/gimpressionist/sizemap.c:481 msgid "Select previous smvector" msgstr "Выбрать предыдущий sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:487 +#: ../plug-ins/gimpressionist/sizemap.c:488 msgid "Select next smvector" msgstr "Выбрать следующий sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:494 +#: ../plug-ins/gimpressionist/sizemap.c:495 msgid "Add new smvector" msgstr "Добавить новый sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:501 +#: ../plug-ins/gimpressionist/sizemap.c:502 msgid "Delete selected smvector" msgstr "Удалить выбранный sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:514 +#: ../plug-ins/gimpressionist/sizemap.c:515 msgid "Change the angle of the selected smvector" msgstr "Изменить угол выбранного sm-вектора" -#: ../plug-ins/gimpressionist/sizemap.c:521 +#: ../plug-ins/gimpressionist/sizemap.c:522 msgid "S_trength:" msgstr "Сила:" -#: ../plug-ins/gimpressionist/sizemap.c:525 +#: ../plug-ins/gimpressionist/sizemap.c:526 msgid "Change the strength of the selected smvector" msgstr "Изменить длину выбранного sm-вектора" -#: ../plug-ins/gimpressionist/sizemap.c:532 +#: ../plug-ins/gimpressionist/sizemap.c:533 msgid "St_rength exp.:" msgstr "Экспонента силы:" -#: ../plug-ins/gimpressionist/sizemap.c:548 +#: ../plug-ins/gimpressionist/sizemap.c:549 msgid "" "Voronoi-mode makes only the smvector closest to the given point have any " "influence" @@ -12434,6 +12439,14 @@ msgstr "_Лабиринт..." msgid "Drawing maze" msgstr "Рисование лабиринта" +#: ../plug-ins/metadata/metadata.c:182 +msgid "View and edit metadata (EXIF, IPTC, XMP)" +msgstr "Просмотр и редактирование метаданных (EXIF, IPTC, XMP)" + +#: ../plug-ins/metadata/metadata.c:191 +msgid "Propert_ies" +msgstr "Сво_йства" + #: ../plug-ins/metadata/xmp-parse.c:238 #, c-format msgid "Error: No XMP packet found" @@ -12659,35 +12672,35 @@ msgstr "Получение данных со сканера/камеры" msgid "Grab" msgstr "Захватить" -#: ../plug-ins/win-snap/winsnap.c:880 +#: ../plug-ins/win-snap/winsnap.c:881 msgid "Grab a single window" msgstr "Захватить одно окно" -#: ../plug-ins/win-snap/winsnap.c:894 +#: ../plug-ins/win-snap/winsnap.c:895 msgid "Grab the whole screen" msgstr "Захватить весь экран" -#: ../plug-ins/win-snap/winsnap.c:910 +#: ../plug-ins/win-snap/winsnap.c:911 msgid "after" msgstr "через" -#: ../plug-ins/win-snap/winsnap.c:922 +#: ../plug-ins/win-snap/winsnap.c:923 msgid "Seconds delay" msgstr "Задержка в секундах" -#: ../plug-ins/win-snap/winsnap.c:929 +#: ../plug-ins/win-snap/winsnap.c:930 msgid "Include decorations" msgstr "Включая обрамление" -#: ../plug-ins/win-snap/winsnap.c:988 +#: ../plug-ins/win-snap/winsnap.c:989 msgid "Capture a window or desktop image" msgstr "Создать снимок экрана с рабочим столом или окнами" -#: ../plug-ins/win-snap/winsnap.c:993 +#: ../plug-ins/win-snap/winsnap.c:994 msgid "_Screen Shot..." msgstr "_Снимок экрана..." -#: ../plug-ins/win-snap/winsnap.c:1141 +#: ../plug-ins/win-snap/winsnap.c:1142 msgid "No data captured" msgstr "Данные не захвачены" diff --git a/po-python/POTFILES.skip b/po-python/POTFILES.skip index 183ffd25df..554cd375f3 100644 --- a/po-python/POTFILES.skip +++ b/po-python/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-script-fu/POTFILES.skip b/po-script-fu/POTFILES.skip index 60f84f31de..d004731936 100644 --- a/po-script-fu/POTFILES.skip +++ b/po-script-fu/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-tags/.gitignore b/po-tags/.gitignore new file mode 100644 index 0000000000..e973f08fb2 --- /dev/null +++ b/po-tags/.gitignore @@ -0,0 +1 @@ +/.intltool-merge-cache diff --git a/po-tags/LINGUAS b/po-tags/LINGUAS new file mode 100644 index 0000000000..ab6dc346c1 --- /dev/null +++ b/po-tags/LINGUAS @@ -0,0 +1,3 @@ +# please keep this list sorted alphabetically +# +sv diff --git a/po-tags/POTFILES.in b/po-tags/POTFILES.in new file mode 100644 index 0000000000..61a1c927c5 --- /dev/null +++ b/po-tags/POTFILES.in @@ -0,0 +1,6 @@ +# Files from the Gimp distribution which have already been +# marked to allow runtime translation of messages + +[encoding: UTF-8] + +data/tags/gimp-tags-default.xml.in diff --git a/po-tags/sv.po b/po-tags/sv.po new file mode 100644 index 0000000000..7a771488e4 --- /dev/null +++ b/po-tags/sv.po @@ -0,0 +1,23 @@ +# Swedish messages for gimp-tags. +# Copyright (C) 1998-2009 Free Software Foundation, Inc. +# Martin Nordholts , 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: gimp-tags\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-07-16 19:05+0200\n" +"PO-Revision-Date: 2009-07-16 19:11+0200\n" +"Last-Translator: Martin Nordholts \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/tags/gimp-tags-default.xml.in.h:1 +msgid "circle" +msgstr "cirkel" + +#: ../data/tags/gimp-tags-default.xml.in.h:2 +msgid "fuzzy" +msgstr "luddig" diff --git a/po-tips/POTFILES.skip b/po-tips/POTFILES.skip index 66333ad8d3..f94378733b 100644 --- a/po-tips/POTFILES.skip +++ b/po-tips/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags desktop desktop/gimp.desktop.in libgimp diff --git a/po/POTFILES.skip b/po/POTFILES.skip index f6d7a4a9ae..28eb1abc1e 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,4 +1,5 @@ app/widgets/gtkscalebutton.c +data/tags/gimp-tags-default.xml.in data/tips/gimp-tips.xml.in desktop/gimp.desktop.in libgimp