Adding upstream version 2.10.34.upstream/2.10.34upstream

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

1 files changed, 208 insertions, 0 deletions

diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
new file mode 100644
index 0000000..f2ba08b
--- /dev/null
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-2001 Spencer Kimball, Peter Mattis, and others
+ *
+ * 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 "widgets/gimpwidgets-utils.h"
+
+#include "gimpcolorpickeroptions.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLE_AVERAGE, /* overrides a GimpColorOptions property */
+  PROP_PICK_TARGET,
+  PROP_USE_INFO_WINDOW,
+  PROP_FRAME1_MODE,
+  PROP_FRAME2_MODE
+};
+
+
+static void   gimp_color_picker_options_set_property (GObject      *object,
+                                                      guint         property_id,
+                                                      const GValue *value,
+                                                      GParamSpec   *pspec);
+static void   gimp_color_picker_options_get_property (GObject      *object,
+                                                      guint         property_id,
+                                                      GValue       *value,
+                                                      GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpColorPickerOptions, gimp_color_picker_options,
+               GIMP_TYPE_COLOR_OPTIONS)
+
+
+static void
+gimp_color_picker_options_class_init (GimpColorPickerOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_color_picker_options_set_property;
+  object_class->get_property = gimp_color_picker_options_get_property;
+
+  /* override a GimpColorOptions property to get a different default value */
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_AVERAGE,
+                            "sample-average",
+                            _("Sample average"),
+                            _("Use averaged color value from "
+                              "nearby pixels"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_PICK_TARGET,
+                         "pick-target",
+                         _("Pick Target"),
+                         _("Choose what the color picker will do"),
+                         GIMP_TYPE_COLOR_PICK_TARGET,
+                         GIMP_COLOR_PICK_TARGET_FOREGROUND,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_INFO_WINDOW,
+                            "use-info-window",
+                            _("Use info window"),
+                            _("Open a floating dialog to view picked "
+                              "color values in various color models"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME1_MODE,
+                         "frame1-mode",
+                         "Frame 1 Mode", NULL,
+                         GIMP_TYPE_COLOR_PICK_MODE,
+                         GIMP_COLOR_PICK_MODE_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME2_MODE,
+                         "frame2-mode",
+                         "Frame 2 Mode", NULL,
+                         GIMP_TYPE_COLOR_PICK_MODE,
+                         GIMP_COLOR_PICK_MODE_RGB_PERCENT,
+                         GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_color_picker_options_init (GimpColorPickerOptions *options)
+{
+}
+
+static void
+gimp_color_picker_options_set_property (GObject      *object,
+                                        guint         property_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_AVERAGE:
+      GIMP_COLOR_OPTIONS (options)->sample_average = g_value_get_boolean (value);
+      break;
+    case PROP_PICK_TARGET:
+      options->pick_target = g_value_get_enum (value);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      options->use_info_window = g_value_get_boolean (value);
+      break;
+    case PROP_FRAME1_MODE:
+      options->frame1_mode = g_value_get_enum (value);
+      break;
+    case PROP_FRAME2_MODE:
+      options->frame2_mode = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_color_picker_options_get_property (GObject    *object,
+                                        guint       property_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  GimpColorPickerOptions *options = GIMP_COLOR_PICKER_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_SAMPLE_AVERAGE:
+      g_value_set_boolean (value,
+                           GIMP_COLOR_OPTIONS (options)->sample_average);
+      break;
+    case PROP_PICK_TARGET:
+      g_value_set_enum (value, options->pick_target);
+      break;
+    case PROP_USE_INFO_WINDOW:
+      g_value_set_boolean (value, options->use_info_window);
+      break;
+    case PROP_FRAME1_MODE:
+      g_value_set_enum (value, options->frame1_mode);
+      break;
+    case PROP_FRAME2_MODE:
+      g_value_set_enum (value, options->frame2_mode);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+GtkWidget *
+gimp_color_picker_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config = G_OBJECT (tool_options);
+  GtkWidget       *vbox   = gimp_color_options_gui (tool_options);
+  GtkWidget       *button;
+  GtkWidget       *frame;
+  gchar           *str;
+  GdkModifierType  extend_mask = gimp_get_extend_selection_mask ();
+  GdkModifierType  toggle_mask = gimp_get_toggle_behavior_mask ();
+
+  /*  the pick FG/BG frame  */
+  str = g_strdup_printf (_("Pick Target  (%s)"),
+                         gimp_get_mod_string (toggle_mask));
+  frame = gimp_prop_enum_radio_frame_new (config, "pick-target", str, -1, -1);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /*  the use_info_window toggle button  */
+  str = g_strdup_printf (_("Use info window  (%s)"),
+                         gimp_get_mod_string (extend_mask));
+  button = gimp_prop_check_button_new (config, "use-info-window", str);
+  g_free (str);
+
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  return vbox;
+}