plug-ins: Port int_combo properties to GimpChoice

web-page.c was left as additional font
sizes besides the GUI choices could be set
via a PDB call. The export plug-ins int
combos will be updated in a separate
merge request.
Additionally, the region choice in screenshot.c
was hidden on Windows since it does not
yet implement that option.
This commit is contained in:
Alx Sa 2024-07-26 18:56:53 +00:00
parent acefb593c1
commit 6effe7d38c
6 changed files with 169 additions and 214 deletions

View File

@ -181,42 +181,56 @@ align_layers_create_procedure (GimpPlugIn *plug_in,
gimp_procedure_set_documentation (procedure,
_("Align all visible layers of the image"),
"Align visible layers",
_("Align visible layers"),
name);
gimp_procedure_set_attribution (procedure,
"Shuji Narazaki <narazaki@InetQ.or.jp>",
"Shuji Narazaki",
"1997");
gimp_procedure_add_int_argument (procedure, "horizontal-style",
_("_Horizontal style"),
_("(None = 0, Collect = 1, "
"Fill left to right = 2, Fill right to left = 3, "
"Snap to grid = 4)"),
H_NONE, SNAP2HGRID, H_NONE,
GIMP_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "horizontal-style",
_("_Horizontal style"),
"",
gimp_choice_new_with_values ("none", H_NONE, _("None"), NULL,
"collect", H_COLLECT, _("Collect"), NULL,
"fill-left-to-right", LEFT2RIGHT, _("Fill (left to right)"), NULL,
"fill-right-to-left", RIGHT2LEFT, _("Fill (right to left)"), NULL,
"snap-to-grid", SNAP2HGRID, _("Snap to grid"), NULL,
NULL),
"none",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "horizontal-base",
_("Hori_zontal base"),
_("(Left edge = 0, Center = 1, "
"Right edge = 2)"),
H_BASE_LEFT, H_BASE_RIGHT, H_BASE_LEFT,
GIMP_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "horizontal-base",
_("Hori_zontal base"),
"",
gimp_choice_new_with_values ("left-edge", H_BASE_LEFT, _("Left edge"), NULL,
"center", H_BASE_CENTER, _("Center"), NULL,
"right-edge", H_BASE_RIGHT, _("Right edge"), NULL,
NULL),
"left-edge",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "vertical-style",
_("_Vertical style"),
_("(None = 0, Collect = 1, "
"Fill left to right = 2, Fill right to left = 3, "
"Snap to grid = 4)"),
V_NONE, SNAP2VGRID, V_NONE,
GIMP_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "vertical-style",
_("_Vertical style"),
"",
gimp_choice_new_with_values ("none", V_NONE, _("None"), NULL,
"collect", V_COLLECT, _("Collect"), NULL,
"fill-left-to-right", TOP2BOTTOM, _("Fill (top to bottom)"), NULL,
"fill-right-to-left", BOTTOM2TOP, _("Fill (bottom to top)"), NULL,
"snap-to-grid", SNAP2VGRID, _("Snap to grid"), NULL,
NULL),
"none",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "vertical-base",
_("Ver_tical base"),
_("(Left edge = 0, Center = 1, "
"Right edge = 2)"),
V_BASE_TOP, V_BASE_BOTTOM, V_BASE_TOP,
GIMP_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "vertical-base",
_("Ver_tical base"),
"",
gimp_choice_new_with_values ("top-edge", V_BASE_TOP, _("Top edge"), NULL,
"center", V_BASE_CENTER, _("Center"), NULL,
"bottom-edge", V_BASE_BOTTOM, _("Bottom edge"), NULL,
NULL),
"top-edge",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "grid-size",
_("_Grid"),
@ -528,10 +542,13 @@ align_layers_gather_data (GimpLayer **layers,
gboolean use_bottom_layer;
g_object_get (config,
"horizontal-style", &horizontal_style,
"vertical-style", &vertical_style,
"use-bottom-layer", &use_bottom_layer,
NULL);
horizontal_style = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"horizontal-style");
vertical_style = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"vertical-style");
data.step_x = 0;
data.step_y = 0;
@ -601,10 +618,12 @@ align_layers_perform_alignment (GimpLayer **layers,
gint grid_size;
g_object_get (config,
"horizontal-style", &horizontal_style,
"vertical-style", &vertical_style,
"grid-size", &grid_size,
"grid-size", &grid_size,
NULL);
horizontal_style = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"horizontal-style");
vertical_style = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"vertical-style");
for (index = 0; index < layer_num; index++)
{
@ -678,10 +697,10 @@ align_layers_get_align_offsets (GimpDrawable *drawable,
gint horizontal_base;
gint vertical_base;
g_object_get (config,
"horizontal-base", &horizontal_base,
"vertical-base", &vertical_base,
NULL);
horizontal_base = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"horizontal-base");
vertical_base = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"vertical-base");
switch (horizontal_base)
{
@ -720,9 +739,8 @@ static int
align_layers_dialog (GimpProcedure *procedure,
GObject *config)
{
GtkWidget *dialog;
GtkListStore *store;
gboolean run;
GtkWidget *dialog;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY);
@ -730,49 +748,6 @@ align_layers_dialog (GimpProcedure *procedure,
GIMP_PROCEDURE_CONFIG (config),
_("Align Visible Layers"));
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (dialog));
store = gimp_int_store_new (_("None"), H_NONE,
_("Collect"), H_COLLECT,
_("Fill (left to right)"), LEFT2RIGHT,
_("Fill (right to left)"), RIGHT2LEFT,
_("Snap to grid"), SNAP2HGRID,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"horizontal-style",
GIMP_INT_STORE (store));
store = gimp_int_store_new (_("Left edge"), H_BASE_LEFT,
_("Center"), H_BASE_CENTER,
_("Right edge"), H_BASE_RIGHT,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"horizontal-base",
GIMP_INT_STORE (store));
store = gimp_int_store_new (_("None"), V_NONE,
_("Collect"), V_COLLECT,
_("Fill (top to bottom)"), TOP2BOTTOM,
_("Fill (bottom to top)"), BOTTOM2TOP,
_("Snap to grid"), SNAP2VGRID,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"vertical-style",
GIMP_INT_STORE (store));
store = gimp_int_store_new (_("Top edge"), V_BASE_TOP,
_("Center"), V_BASE_CENTER,
_("Bottom edge"), V_BASE_BOTTOM,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"vertical-base",
GIMP_INT_STORE (store));
gimp_procedure_dialog_get_scale_entry (GIMP_PROCEDURE_DIALOG (dialog),
"grid-size", 1.0);

View File

@ -147,11 +147,21 @@ border_average_create_procedure (GimpPlugIn *plug_in,
_("Border size unit of measure"),
TRUE, TRUE, GIMP_UNIT_PIXEL,
GIMP_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "bucket-exponent",
_("Bucket Si_ze"),
_("Bits for bucket size (default=4: 16 Levels)"),
0, G_MAXINT, 4,
G_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "bucket-exponent",
_("Bucket Si_ze"),
_("Bits for bucket size"),
gimp_choice_new_with_values ("levels-1", 0, _("1"), NULL,
"levels-2", 1, _("2"), NULL,
"levels-4", 2, _("4"), NULL,
"levels-8", 3, _("8)"), NULL,
"levels-16", 4, _("16"), NULL,
"levels-32", 5, _("32"), NULL,
"levels-64", 6, _("64"), NULL,
"levels-128", 7, _("128"), NULL,
"levels-256", 8, _("256"), NULL,
NULL),
"levels-16",
G_PARAM_READWRITE);
gimp_procedure_add_color_return_value (procedure, "borderaverage",
_("The average color of the specified border."),
@ -255,8 +265,10 @@ borderaverage (GObject *config,
g_object_get (config,
"thickness", &borderaverage_thickness,
"bucket-exponent", &borderaverage_bucket_exponent,
NULL);
borderaverage_bucket_exponent =
gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"bucket-exponent");
if (! gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height))
{
@ -381,12 +393,11 @@ borderaverage_dialog (GimpProcedure *procedure,
GimpImage *image,
GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkListStore *store;
GtkWidget *size_entry;
gboolean run;
gdouble xres, yres;
GeglBuffer *buffer = NULL;
GtkWidget *dialog;
GtkWidget *size_entry;
gboolean run;
gdouble xres, yres;
GeglBuffer *buffer = NULL;
gimp_ui_init (PLUG_IN_BINARY);
@ -394,13 +405,6 @@ borderaverage_dialog (GimpProcedure *procedure,
GIMP_PROCEDURE_CONFIG (config),
_("Border Average"));
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (dialog));
gimp_procedure_dialog_get_label (GIMP_PROCEDURE_DIALOG (dialog),
"border-size-label",
_("Border Size"),
@ -433,13 +437,6 @@ borderaverage_dialog (GimpProcedure *procedure,
_("Number of Colors"),
FALSE, FALSE);
store = gimp_int_store_new ("1", 0, "2", 1, "4", 2, "8", 3,
"16", 4, "32", 5, "64", 6, "128", 7,
"256", 8, NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"bucket-exponent",
GIMP_INT_STORE (store));
gimp_procedure_dialog_fill_frame (GIMP_PROCEDURE_DIALOG (dialog),
"bucket-size-frame", "bucket-size-label",
FALSE, "bucket-exponent");

View File

@ -207,12 +207,15 @@ retinex_create_procedure (GimpPlugIn *plug_in,
0, MAX_RETINEX_SCALES, 3,
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "scales-mode",
_("Le_vel"),
_("Retinex distribution through scales "
"{ Uniform (0), Low (1), High (2) }"),
RETINEX_UNIFORM, RETINEX_HIGH, RETINEX_UNIFORM,
G_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "scales-mode",
_("Le_vel"),
_("Retinex distribution through scales"),
gimp_choice_new_with_values ("uniform", filter_uniform, _("Uniform"), NULL,
"low", filter_low, _("Low"), NULL,
"high", filter_high, _("High"), NULL,
NULL),
"uniform",
G_PARAM_READWRITE);
gimp_procedure_add_double_argument (procedure, "cvar",
_("Dy_namic"),
@ -296,7 +299,6 @@ retinex_dialog (GimpProcedure *procedure,
GtkWidget *preview;
GtkWidget *combo;
GtkWidget *scale;
GtkListStore *store;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY);
@ -305,26 +307,14 @@ retinex_dialog (GimpProcedure *procedure,
GIMP_PROCEDURE_CONFIG (config),
_("Retinex Image Enhancement"));
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (dialog));
preview = gimp_zoom_preview_new_from_drawable (drawable);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
preview, TRUE, TRUE, 0);
gtk_widget_set_margin_bottom (preview, 12);
gtk_widget_show (preview);
store = gimp_int_store_new (_("Uniform"), filter_uniform,
_("Low"), filter_low,
_("High"), filter_high,
NULL);
combo = gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"scales-mode",
GIMP_INT_STORE (store));
combo = gimp_procedure_dialog_get_widget (GIMP_PROCEDURE_DIALOG (dialog),
"scales-mode", G_TYPE_NONE);
gtk_widget_set_margin_bottom (combo, 12);
scale = gimp_procedure_dialog_get_scale_entry (GIMP_PROCEDURE_DIALOG (dialog),
@ -647,11 +637,12 @@ MSRCR (GObject *config,
gdouble cvar;
g_object_get (config,
"scales-mode", &scales_mode,
"scale", &config_scale,
"nscales", &nscales,
"cvar", &cvar,
"scale", &config_scale,
"nscales", &nscales,
"cvar", &cvar,
NULL);
scales_mode = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"scales-mode");
if (!preview_mode)
{

View File

@ -187,12 +187,16 @@ despeckle_create_procedure (GimpPlugIn *plug_in,
1, MAX_RADIUS, 3,
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "type",
_("_Filter Type"),
_("Filter type { MEDIAN (0), ADAPTIVE (1), "
"RECURSIVE-MEDIAN (2), RECURSIVE-ADAPTIVE (3) }"),
0, 3, FILTER_ADAPTIVE,
G_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "type",
_("_Filter Type"),
_("Filter type"),
gimp_choice_new_with_values ("median", 0, _("Median"), NULL,
"adaptive", FILTER_ADAPTIVE, _("Adaptive"), NULL,
"recursive-median", FILTER_RECURSIVE, _("Recursive-Median"), NULL,
"recursive-adaptive", 3, _("Recursive-Adaptive"), NULL,
NULL),
"adaptive",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "black",
_("_Black level"),
@ -371,13 +375,12 @@ despeckle_dialog (GimpProcedure *procedure,
GObject *config,
GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *preview;
GtkWidget *vbox;
GtkWidget *scale;
GtkWidget *combo;
GtkListStore *store;
gboolean run;
GtkWidget *dialog;
GtkWidget *preview;
GtkWidget *vbox;
GtkWidget *scale;
GtkWidget *combo;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY);
@ -385,16 +388,8 @@ despeckle_dialog (GimpProcedure *procedure,
GIMP_PROCEDURE_CONFIG (config),
_("Despeckle"));
gimp_window_set_transient (GTK_WINDOW (dialog));
store = gimp_int_store_new (_("Median"), 0,
_("Adaptive"), FILTER_ADAPTIVE,
_("Recursive-Median"), FILTER_RECURSIVE,
_("Recursive-Adaptive"), 3,
NULL);
combo = gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"type",
GIMP_INT_STORE (store));
combo = gimp_procedure_dialog_get_widget (GIMP_PROCEDURE_DIALOG (dialog),
"type", G_TYPE_NONE);
gtk_widget_set_margin_bottom (combo, 12);
/*
@ -747,10 +742,11 @@ despeckle_median (GObject *config,
g_object_get (config,
"radius", &radius,
"type", &filter_type,
"black", &black_level,
"white", &white_level,
NULL);
filter_type = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"type");
memset (&histogram, 0, sizeof(histogram));
progress = 0;

View File

@ -85,10 +85,11 @@ select_window (GimpProcedureConfig *config,
gint y2 = 0;
g_object_get (config,
"shoot-type", &shoot_type,
"screenshot-delay", &screenshot_delay,
"include-decoration", &decorate,
NULL);
shoot_type = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"shoot-type");
if (shoot_type == SHOOT_REGION)
mask |= PointerMotionMask;
@ -596,11 +597,12 @@ screenshot_x11_shoot (GimpProcedureConfig *config,
guint window_id = 0;
g_object_get (config,
"shoot-type", &shoot_type,
"screenshot-delay", &screenshot_delay,
"selection-delay", &select_delay,
"include-pointer", &show_cursor,
NULL);
shoot_type = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"shoot-type");
/* use default screen if we are running non-interactively */
if (monitor == NULL)

View File

@ -127,20 +127,20 @@ screenshot_create_procedure (GimpPlugIn *plug_in,
gimp_procedure_set_documentation
(procedure,
_("Create an image from an area of the screen"),
"The plug-in takes screenshots of an "
"interactively selected window or of the desktop, "
"either the whole desktop or an interactively "
"selected region. When called non-interactively, it "
"may grab the root window or use the window-id "
"passed as a parameter. The last four parameters "
"are optional and can be used to specify the corners "
"of the region to be grabbed."
"On Mac OS X, "
"when called non-interactively, the plug-in"
"only can take screenshots of the entire root window."
"Grabbing a window or a region is not supported"
"non-interactively. To grab a region or a particular"
"window, you need to use the interactive mode.",
"The plug-in takes screenshots of an "
"interactively selected window or of the desktop, "
"either the whole desktop or an interactively "
"selected region. When called non-interactively, it "
"may grab the root window or use the window-id "
"passed as a parameter. The last four parameters "
"are optional and can be used to specify the corners "
"of the region to be grabbed."
"On Mac OS X, "
"when called non-interactively, the plug-in"
"only can take screenshots of the entire root window."
"Grabbing a window or a region is not supported"
"non-interactively. To grab a region or a particular"
"window, you need to use the interactive mode.",
name);
gimp_procedure_set_attribution (procedure,
@ -160,12 +160,19 @@ screenshot_create_procedure (GimpPlugIn *plug_in,
GIMP_RUN_NONINTERACTIVE,
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "shoot-type",
_("Shoot _area"),
_("The shoot type { SHOOT-WINDOW (0), SHOOT-ROOT (1), "
"SHOOT-REGION (2) }"),
0, 2, SHOOT_WINDOW,
G_PARAM_READWRITE);
/* TODO: Windows does not currently implement selecting by region to grab,
* so we'll hide this option for now */
gimp_procedure_add_choice_argument (procedure, "shoot-type",
_("Shoot _area"),
_("The shoot type"),
gimp_choice_new_with_values ("window", SHOOT_WINDOW, _("Take a screenshot of a single window"), NULL,
"screen", SHOOT_ROOT, _("Take a screenshot of the entire screen"), NULL,
#ifndef G_OS_WIN32
"region", SHOOT_REGION, _("Select a region to grab"), NULL,
#endif
NULL),
"window",
G_PARAM_READWRITE);
gimp_procedure_add_int_argument (procedure, "x1",
"X1",
@ -220,12 +227,14 @@ screenshot_create_procedure (GimpPlugIn *plug_in,
_("Delay before snapping the screenshot"),
0, 20, 0,
G_PARAM_READWRITE);
gimp_procedure_add_int_aux_argument (procedure, "color-profile",
_("Color _Profile"),
"{ SCREENSHOT_PROFILE_POLICY_MONITOR, (0), "
"SCREENSHOT_PROFILE_POLICY_MONITOR, (1) } ",
0, 1, SCREENSHOT_PROFILE_POLICY_MONITOR,
G_PARAM_READWRITE);
gimp_procedure_add_choice_argument (procedure, "color-profile",
_("Color _Profile"),
"",
gimp_choice_new_with_values ("monitor", SCREENSHOT_PROFILE_POLICY_MONITOR, _("Tag image with monitor profile"), NULL,
"srgb", SCREENSHOT_PROFILE_POLICY_SRGB, _("Convert image with sRGB"), NULL,
NULL),
"monitor",
G_PARAM_READWRITE);
gimp_procedure_add_image_return_value (procedure, "image",
"Image",
@ -254,10 +263,9 @@ screenshot_run (GimpProcedure *procedure,
gegl_init (NULL, NULL);
g_object_get (config,
"run-mode", &run_mode,
"shoot-type", &shoot_type,
NULL);
g_object_get (config, "run-mode", &run_mode, NULL);
shoot_type = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"shoot-type");
if (! gdk_init_check (NULL, NULL))
{
@ -325,7 +333,7 @@ screenshot_run (GimpProcedure *procedure,
* shared by all screenshot backends (basically just snap the
* whole display setup).
*/
g_object_set (config, "shoot-type", SHOOT_ROOT, NULL);
g_object_set (config, "shoot-type", "screen", NULL);
}
/* Get information from the dialog. Freedesktop portal comes with
@ -376,9 +384,8 @@ screenshot_run (GimpProcedure *procedure,
gimp_image_undo_disable (image);
g_object_get (config,
"color-profile", &profile_policy,
NULL);
profile_policy = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"color-profile");
if (run_mode == GIMP_RUN_NONINTERACTIVE)
profile_policy = SCREENSHOT_PROFILE_POLICY_MONITOR;
@ -453,12 +460,13 @@ shoot (GdkMonitor *monitor,
gboolean show_cursor;
g_object_get (config,
"shoot-type", &shoot_type,
"screenshot-delay", &screenshot_delay,
"selection-delay", &select_delay,
"include-decoration", &decorate,
"include-pointer", &show_cursor,
NULL);
shoot_type = gimp_procedure_config_get_choice_id (GIMP_PROCEDURE_CONFIG (config),
"shoot-type");
#ifdef PLATFORM_OSX
if (backend == SCREENSHOT_BACKEND_OSX)
@ -494,7 +502,6 @@ shoot_dialog (GimpProcedure *procedure,
GdkMonitor **monitor)
{
GtkWidget *dialog;
GtkListStore *store;
GimpValueArray *values;
GValue value = G_VALUE_INIT;
gboolean run;
@ -504,13 +511,6 @@ shoot_dialog (GimpProcedure *procedure,
_("Screenshot"));
gimp_procedure_dialog_set_ok_label (GIMP_PROCEDURE_DIALOG (dialog), _("S_nap"));
store = gimp_int_store_new (_("Take a screenshot of a single window"), SHOOT_WINDOW,
_("Take a screenshot of the entire screen"), SHOOT_ROOT,
_("Select a region to grab"), SHOOT_REGION,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"shoot-type", GIMP_INT_STORE (store));
if (capabilities & SCREENSHOT_CAN_SHOOT_POINTER ||
capabilities & SCREENSHOT_CAN_SHOOT_DECORATIONS)
{
@ -541,8 +541,8 @@ shoot_dialog (GimpProcedure *procedure,
if (capabilities & SCREENSHOT_CAN_SHOOT_DECORATIONS)
{
values = gimp_value_array_new (1);
g_value_init (&value, G_TYPE_INT);
g_value_set_int (&value, SHOOT_WINDOW);
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, "window");
gimp_value_array_append (values, &value);
g_value_unset (&value);
gimp_procedure_dialog_set_sensitive_if_in (GIMP_PROCEDURE_DIALOG (dialog),
@ -553,8 +553,8 @@ shoot_dialog (GimpProcedure *procedure,
if (capabilities & SCREENSHOT_CAN_SHOOT_POINTER)
{
values = gimp_value_array_new (1);
g_value_init (&value, G_TYPE_INT);
g_value_set_int (&value, SHOOT_REGION);
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, "region");
gimp_value_array_append (values, &value);
g_value_unset (&value);
gimp_procedure_dialog_set_sensitive_if_in (GIMP_PROCEDURE_DIALOG (dialog),
@ -575,8 +575,8 @@ shoot_dialog (GimpProcedure *procedure,
NULL);
values = gimp_value_array_new (1);
g_value_init (&value, G_TYPE_INT);
g_value_set_int (&value, SHOOT_ROOT);
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, "screen");
gimp_value_array_append (values, &value);
g_value_unset (&value);
gimp_procedure_dialog_set_sensitive_if_in (GIMP_PROCEDURE_DIALOG (dialog),
@ -600,12 +600,6 @@ shoot_dialog (GimpProcedure *procedure,
gimp_procedure_dialog_fill (GIMP_PROCEDURE_DIALOG (dialog), "shoot-type", NULL);
store = gimp_int_store_new (_("Tag image with monitor profile"), SCREENSHOT_PROFILE_POLICY_MONITOR,
_("Convert image with sRGB"), SCREENSHOT_PROFILE_POLICY_SRGB,
NULL);
gimp_procedure_dialog_get_int_combo (GIMP_PROCEDURE_DIALOG (dialog),
"color-profile", GIMP_INT_STORE (store));
if ((capabilities & SCREENSHOT_CAN_SHOOT_POINTER) ||
(capabilities & SCREENSHOT_CAN_SHOOT_DECORATIONS))
gimp_procedure_dialog_fill (GIMP_PROCEDURE_DIALOG (dialog), "contents-frame", NULL);