Adding upstream version 2.10.36.upstream/2.10.36

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

1 files changed, 183 insertions, 0 deletions

diff --git a/app/dialogs/fill-dialog.c b/app/dialogs/fill-dialog.c
new file mode 100644
index 0000000..a74bfd1
--- /dev/null
+++ b/app/dialogs/fill-dialog.c
@@ -0,0 +1,183 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * fill-dialog.c
+ * Copyright (C) 2016  Michael Natterer <mitch@gimp.org>
+ *
+ * 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 "dialogs-types.h"
+
+#include "core/gimpdrawable.h"
+#include "core/gimpfilloptions.h"
+
+#include "widgets/gimpfilleditor.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "fill-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+typedef struct _FillDialog FillDialog;
+
+struct _FillDialog
+{
+  GimpItem         *item;
+  GimpDrawable     *drawable;
+  GimpContext      *context;
+  GimpFillOptions  *options;
+  GimpFillCallback  callback;
+  gpointer          user_data;
+};
+
+
+/*  local function prototypes  */
+
+static void  fill_dialog_free     (FillDialog *private);
+static void  fill_dialog_response (GtkWidget  *dialog,
+                                   gint        response_id,
+                                   FillDialog *private);
+
+
+/*  public function  */
+
+GtkWidget *
+fill_dialog_new (GimpItem         *item,
+                 GimpDrawable     *drawable,
+                 GimpContext      *context,
+                 const gchar      *title,
+                 const gchar      *icon_name,
+                 const gchar      *help_id,
+                 GtkWidget        *parent,
+                 GimpFillOptions  *options,
+                 GimpFillCallback  callback,
+                 gpointer          user_data)
+{
+  FillDialog *private;
+  GtkWidget  *dialog;
+  GtkWidget  *main_vbox;
+  GtkWidget  *fill_editor;
+
+  g_return_val_if_fail (GIMP_IS_ITEM (item), NULL);
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (help_id != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  private = g_slice_new0 (FillDialog);
+
+  private->item      = item;
+  private->drawable  = drawable;
+  private->context   = context;
+  private->options   = gimp_fill_options_new (context->gimp, context, TRUE);
+  private->callback  = callback;
+  private->user_data = user_data;
+
+  gimp_config_sync (G_OBJECT (options),
+                    G_OBJECT (private->options), 0);
+
+  dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (item), context,
+                                     title, "gimp-fill-options",
+                                     icon_name,
+                                     _("Choose Fill Style"),
+                                     parent,
+                                     gimp_standard_help_func,
+                                     help_id,
+
+                                     _("_Reset"),  RESPONSE_RESET,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Fill"),   GTK_RESPONSE_OK,
+
+                                     NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  g_object_weak_ref (G_OBJECT (dialog),
+                     (GWeakNotify) fill_dialog_free, private);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (fill_dialog_response),
+                    private);
+
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      main_vbox, TRUE, TRUE, 0);
+  gtk_widget_show (main_vbox);
+
+  fill_editor = gimp_fill_editor_new (private->options, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), fill_editor, FALSE, FALSE, 0);
+  gtk_widget_show (fill_editor);
+
+  return dialog;
+}
+
+
+/*  private functions  */
+
+static void
+fill_dialog_free (FillDialog *private)
+{
+  g_object_unref (private->options);
+
+  g_slice_free (FillDialog, private);
+}
+
+static void
+fill_dialog_response (GtkWidget  *dialog,
+                      gint        response_id,
+                      FillDialog *private)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gimp_config_reset (GIMP_CONFIG (private->options));
+      break;
+
+    case GTK_RESPONSE_OK:
+      private->callback (dialog,
+                         private->item,
+                         private->drawable,
+                         private->context,
+                         private->options,
+                         private->user_data);
+      break;
+
+    default:
+      gtk_widget_destroy (dialog);
+      break;
+    }
+}