Adding upstream version 2.10.22.upstream/2.10.22upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 544 insertions, 0 deletions

diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
new file mode 100644
index 0000000..f5615c2
--- /dev/null
+++ b/app/tools/gimpbucketfilloptions.c
@@ -0,0 +1,544 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimptoolinfo.h"
+
+#include "display/gimpdisplay.h"
+
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimpbucketfilloptions.h"
+#include "gimppaintoptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FILL_MODE,
+  PROP_FILL_AREA,
+  PROP_FILL_TRANSPARENT,
+  PROP_SAMPLE_MERGED,
+  PROP_DIAGONAL_NEIGHBORS,
+  PROP_ANTIALIAS,
+  PROP_FEATHER,
+  PROP_FEATHER_RADIUS,
+  PROP_THRESHOLD,
+  PROP_LINE_ART_SOURCE,
+  PROP_LINE_ART_THRESHOLD,
+  PROP_LINE_ART_MAX_GROW,
+  PROP_LINE_ART_MAX_GAP_LENGTH,
+  PROP_FILL_CRITERION
+};
+
+struct _GimpBucketFillOptionsPrivate
+{
+  GtkWidget *diagonal_neighbors_checkbox;
+  GtkWidget *threshold_scale;
+
+  GtkWidget *similar_color_frame;
+  GtkWidget *line_art_frame;
+};
+
+static void   gimp_bucket_fill_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void   gimp_bucket_fill_options_set_property      (GObject               *object,
+                                                          guint                  property_id,
+                                                          const GValue          *value,
+                                                          GParamSpec            *pspec);
+static void   gimp_bucket_fill_options_get_property      (GObject               *object,
+                                                          guint                  property_id,
+                                                          GValue                *value,
+                                                          GParamSpec            *pspec);
+
+static void   gimp_bucket_fill_options_reset             (GimpConfig            *config);
+static void   gimp_bucket_fill_options_update_area       (GimpBucketFillOptions *options);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpBucketFillOptions, gimp_bucket_fill_options,
+                         GIMP_TYPE_PAINT_OPTIONS,
+                         G_ADD_PRIVATE (GimpBucketFillOptions)
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_bucket_fill_options_config_iface_init))
+
+#define parent_class gimp_bucket_fill_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_bucket_fill_options_class_init (GimpBucketFillOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_bucket_fill_options_set_property;
+  object_class->get_property = gimp_bucket_fill_options_get_property;
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_MODE,
+                         "fill-mode",
+                         _("Fill type"),
+                         NULL,
+                         GIMP_TYPE_BUCKET_FILL_MODE,
+                         GIMP_BUCKET_FILL_FG,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_AREA,
+                         "fill-area",
+                         _("Fill selection"),
+                         _("Which area will be filled"),
+                         GIMP_TYPE_BUCKET_FILL_AREA,
+                         GIMP_BUCKET_FILL_SIMILAR_COLORS,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILL_TRANSPARENT,
+                            "fill-transparent",
+                            _("Fill transparent areas"),
+                            _("Allow completely transparent regions "
+                              "to be filled"),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+                            "sample-merged",
+                            _("Sample merged"),
+                            _("Base filled area on all visible layers"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DIAGONAL_NEIGHBORS,
+                            "diagonal-neighbors",
+                            _("Diagonal neighbors"),
+                            _("Treat diagonally neighboring pixels as "
+                              "connected"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            _("Base fill opacity on color difference from "
+                              "the clicked pixel (see threshold) or on line "
+                              " art borders. Disable antialiasing to fill "
+                              "the entire area uniformly."),
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FEATHER,
+                            "feather",
+                            _("Feather edges"),
+                            _("Enable feathering of fill edges"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS,
+                           "feather-radius",
+                           _("Radius"),
+                           _("Radius of feathering"),
+                           0.0, 100.0, 10.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_THRESHOLD,
+                           "threshold",
+                           _("Threshold"),
+                           _("Maximum color difference"),
+                           0.0, 255.0, 15.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_LINE_ART_SOURCE,
+                         "line-art-source",
+                         _("Source"),
+                         _("Source image for line art computation"),
+                         GIMP_TYPE_LINE_ART_SOURCE,
+                         GIMP_LINE_ART_SOURCE_SAMPLE_MERGED,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LINE_ART_THRESHOLD,
+                           "line-art-threshold",
+                           _("Line art detection threshold"),
+                           _("Threshold to detect contour (higher values will include more pixels)"),
+                           0.0, 1.0, 0.92,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LINE_ART_MAX_GROW,
+                        "line-art-max-grow",
+                        _("Maximum growing size"),
+                        _("Maximum number of pixels grown under the line art"),
+                        1, 100, 3,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_INT (object_class, PROP_LINE_ART_MAX_GAP_LENGTH,
+                        "line-art-max-gap-length",
+                        _("Maximum gap length"),
+                        _("Maximum gap (in pixels) in line art which can be closed"),
+                        0, 1000, 100,
+                        GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FILL_CRITERION,
+                         "fill-criterion",
+                         _("Fill by"),
+                         _("Criterion used for determining color similarity"),
+                         GIMP_TYPE_SELECT_CRITERION,
+                         GIMP_SELECT_CRITERION_COMPOSITE,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_bucket_fill_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_bucket_fill_options_reset;
+}
+
+static void
+gimp_bucket_fill_options_init (GimpBucketFillOptions *options)
+{
+  options->priv = gimp_bucket_fill_options_get_instance_private (options);
+}
+
+static void
+gimp_bucket_fill_options_set_property (GObject      *object,
+                                       guint         property_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FILL_MODE:
+      options->fill_mode = g_value_get_enum (value);
+      break;
+    case PROP_FILL_AREA:
+      options->fill_area = g_value_get_enum (value);
+      gimp_bucket_fill_options_update_area (options);
+      break;
+    case PROP_FILL_TRANSPARENT:
+      options->fill_transparent = g_value_get_boolean (value);
+      break;
+    case PROP_SAMPLE_MERGED:
+      options->sample_merged = g_value_get_boolean (value);
+      break;
+    case PROP_DIAGONAL_NEIGHBORS:
+      options->diagonal_neighbors = g_value_get_boolean (value);
+      break;
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER:
+      options->feather = g_value_get_boolean (value);
+      break;
+    case PROP_FEATHER_RADIUS:
+      options->feather_radius = g_value_get_double (value);
+      break;
+    case PROP_THRESHOLD:
+      options->threshold = g_value_get_double (value);
+      break;
+    case PROP_LINE_ART_SOURCE:
+      options->line_art_source = g_value_get_enum (value);
+      break;
+    case PROP_LINE_ART_THRESHOLD:
+      options->line_art_threshold = g_value_get_double (value);
+      break;
+    case PROP_LINE_ART_MAX_GROW:
+      options->line_art_max_grow = g_value_get_int (value);
+      break;
+    case PROP_LINE_ART_MAX_GAP_LENGTH:
+      options->line_art_max_gap_length = g_value_get_int (value);
+      break;
+    case PROP_FILL_CRITERION:
+      options->fill_criterion = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_bucket_fill_options_get_property (GObject    *object,
+                                       guint       property_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FILL_MODE:
+      g_value_set_enum (value, options->fill_mode);
+      break;
+    case PROP_FILL_AREA:
+      g_value_set_enum (value, options->fill_area);
+      break;
+    case PROP_FILL_TRANSPARENT:
+      g_value_set_boolean (value, options->fill_transparent);
+      break;
+    case PROP_SAMPLE_MERGED:
+      g_value_set_boolean (value, options->sample_merged);
+      break;
+    case PROP_DIAGONAL_NEIGHBORS:
+      g_value_set_boolean (value, options->diagonal_neighbors);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+    case PROP_FEATHER:
+      g_value_set_boolean (value, options->feather);
+      break;
+    case PROP_FEATHER_RADIUS:
+      g_value_set_double (value, options->feather_radius);
+      break;
+    case PROP_THRESHOLD:
+      g_value_set_double (value, options->threshold);
+      break;
+    case PROP_LINE_ART_SOURCE:
+      g_value_set_enum (value, options->line_art_source);
+      break;
+    case PROP_LINE_ART_THRESHOLD:
+      g_value_set_double (value, options->line_art_threshold);
+      break;
+    case PROP_LINE_ART_MAX_GROW:
+      g_value_set_int (value, options->line_art_max_grow);
+      break;
+    case PROP_LINE_ART_MAX_GAP_LENGTH:
+      g_value_set_int (value, options->line_art_max_gap_length);
+      break;
+    case PROP_FILL_CRITERION:
+      g_value_set_enum (value, options->fill_criterion);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_bucket_fill_options_reset (GimpConfig *config)
+{
+  GimpToolOptions *tool_options = GIMP_TOOL_OPTIONS (config);
+  GParamSpec      *pspec;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (config),
+                                        "threshold");
+
+  if (pspec)
+    G_PARAM_SPEC_DOUBLE (pspec)->default_value =
+      tool_options->tool_info->gimp->config->default_threshold;
+
+  parent_config_iface->reset (config);
+}
+
+static void
+gimp_bucket_fill_options_update_area (GimpBucketFillOptions *options)
+{
+  /* GUI not created yet. */
+  if (! options->priv->threshold_scale)
+    return;
+
+  switch (options->fill_area)
+    {
+    case GIMP_BUCKET_FILL_LINE_ART:
+      gtk_widget_hide (options->priv->similar_color_frame);
+      gtk_widget_show (options->priv->line_art_frame);
+      break;
+    case GIMP_BUCKET_FILL_SIMILAR_COLORS:
+      gtk_widget_show (options->priv->similar_color_frame);
+      gtk_widget_hide (options->priv->line_art_frame);
+      break;
+    default:
+      gtk_widget_hide (options->priv->similar_color_frame);
+      gtk_widget_hide (options->priv->line_art_frame);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
+{
+  GimpBucketFillOptions *options = GIMP_BUCKET_FILL_OPTIONS (tool_options);
+  GObject               *config = G_OBJECT (tool_options);
+  GtkWidget             *vbox   = gimp_paint_options_gui (tool_options);
+  GtkWidget             *box2;
+  GtkWidget             *frame;
+  GtkWidget             *hbox;
+  GtkWidget             *widget;
+  GtkWidget             *scale;
+  GtkWidget             *combo;
+  gchar                 *str;
+  gboolean               bold;
+  GdkModifierType        extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType        toggle_mask = GDK_MOD1_MASK;
+
+  /*  fill type  */
+  str = g_strdup_printf (_("Fill Type  (%s)"),
+                         gimp_get_mod_string (toggle_mask)),
+  frame = gimp_prop_enum_radio_frame_new (config, "fill-mode", str, 0, 0);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  hbox = gimp_prop_pattern_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                    NULL, 2,
+                                    "pattern-view-type", "pattern-view-size");
+  gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox,
+                             GIMP_BUCKET_FILL_PATTERN, TRUE);
+
+  /*  fill selection  */
+  str = g_strdup_printf (_("Affected Area  (%s)"),
+                         gimp_get_mod_string (extend_mask));
+  frame = gimp_prop_enum_radio_frame_new (config, "fill-area", str, 0, 0);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /* Similar color frame */
+  frame = gimp_frame_new (_("Finding Similar Colors"));
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  options->priv->similar_color_frame = frame;
+  gtk_widget_show (frame);
+
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box2);
+  gtk_widget_show (box2);
+
+  /*  the fill transparent areas toggle  */
+  widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the sample merged toggle  */
+  widget = gimp_prop_check_button_new (config, "sample-merged", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the diagonal neighbors toggle  */
+  widget = gimp_prop_check_button_new (config, "diagonal-neighbors", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  options->priv->diagonal_neighbors_checkbox = widget;
+  gtk_widget_show (widget);
+
+  /*  the antialias toggle  */
+  widget = gimp_prop_check_button_new (config, "antialias", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  the threshold scale  */
+  scale = gimp_prop_spin_scale_new (config, "threshold", NULL,
+                                    1.0, 16.0, 1);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  options->priv->threshold_scale = scale;
+  gtk_widget_show (scale);
+
+  /*  the fill criterion combo  */
+  combo = gimp_prop_enum_combo_box_new (config, "fill-criterion", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fill by"));
+  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /* Line art frame */
+  frame = gimp_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  options->priv->line_art_frame = frame;
+  gtk_widget_show (frame);
+
+  /* Line art: label widget */
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), box2);
+  gtk_widget_show (box2);
+
+  widget = gtk_label_new (_("Line Art Detection"));
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_style_get (GTK_WIDGET (frame),
+                        "label-bold", &bold,
+                        NULL);
+  gimp_label_set_attributes (GTK_LABEL (widget),
+                             PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
+                             -1);
+  gtk_widget_show (widget);
+
+  options->line_art_busy_box = gimp_busy_box_new (_("(computing...)"));
+  gtk_box_pack_start (GTK_BOX (box2), options->line_art_busy_box,
+                      FALSE, FALSE, 0);
+
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box2);
+  gtk_widget_show (box2);
+
+  /*  Line Art: source combo (replace sample merged!) */
+  combo = gimp_prop_enum_combo_box_new (config, "line-art-source", 0, 0);
+  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
+  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
+  gtk_widget_show (combo);
+
+  /*  the fill transparent areas toggle  */
+  widget = gimp_prop_check_button_new (config, "fill-transparent", NULL);
+  gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
+  gtk_widget_show (widget);
+
+  /*  Line Art: feather radius scale  */
+  scale = gimp_prop_spin_scale_new (config, "feather-radius", NULL,
+                                    1.0, 10.0, 1);
+
+  frame = gimp_prop_expanding_frame_new (config, "feather", NULL,
+                                         scale, NULL);
+  gtk_box_pack_start (GTK_BOX (box2), frame, FALSE, FALSE, 0);
+  gtk_widget_show (frame);
+
+  /*  Line Art: max growing size */
+  scale = gimp_prop_spin_scale_new (config, "line-art-max-grow", NULL,
+                                    1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Line Art: stroke threshold */
+  scale = gimp_prop_spin_scale_new (config, "line-art-threshold", NULL,
+                                    0.05, 0.1, 2);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  /*  Line Art: max gap length */
+  scale = gimp_prop_spin_scale_new (config, "line-art-max-gap-length", NULL,
+                                    1, 5, 0);
+  gtk_box_pack_start (GTK_BOX (box2), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
+  gimp_bucket_fill_options_update_area (options);
+
+  return vbox;
+}