Adding upstream version 2.10.36.upstream/2.10.36

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

1 files changed, 208 insertions, 0 deletions

diff --git a/app/display/gimptooldialog.c b/app/display/gimptooldialog.c
new file mode 100644
index 0000000..e0bc082
--- /dev/null
+++ b/app/display/gimptooldialog.c
@@ -0,0 +1,208 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptooldialog.c
+ * Copyright (C) 2003  Sven Neumann <sven@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 "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimpobject.h"
+#include "core/gimptoolinfo.h"
+
+#include "widgets/gimpdialogfactory.h"
+
+#include "gimpdisplayshell.h"
+#include "gimptooldialog.h"
+
+
+typedef struct _GimpToolDialogPrivate GimpToolDialogPrivate;
+
+struct _GimpToolDialogPrivate
+{
+  GimpDisplayShell *shell;
+};
+
+#define GET_PRIVATE(dialog) ((GimpToolDialogPrivate *) gimp_tool_dialog_get_instance_private ((GimpToolDialog *) (dialog)))
+
+
+static void   gimp_tool_dialog_dispose     (GObject          *object);
+
+static void   gimp_tool_dialog_shell_unmap (GimpDisplayShell *shell,
+                                            GimpToolDialog   *dialog);
+
+
+G_DEFINE_TYPE_WITH_PRIVATE (GimpToolDialog, gimp_tool_dialog,
+                            GIMP_TYPE_VIEWABLE_DIALOG)
+
+
+static void
+gimp_tool_dialog_class_init (GimpToolDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gimp_tool_dialog_dispose;
+}
+
+static void
+gimp_tool_dialog_init (GimpToolDialog *dialog)
+{
+}
+
+static void
+gimp_tool_dialog_dispose (GObject *object)
+{
+  GimpToolDialogPrivate *private = GET_PRIVATE (object);
+
+  if (private->shell)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (private->shell),
+                                    (gpointer) &private->shell);
+      private->shell = NULL;
+    }
+
+  G_OBJECT_CLASS (gimp_tool_dialog_parent_class)->dispose (object);
+}
+
+
+/**
+ * gimp_tool_dialog_new:
+ * @tool_info: a #GimpToolInfo
+ * @desc:      a string to use in the dialog header or %NULL to use the help
+ *             field from #GimpToolInfo
+ * @...:       a %NULL-terminated valist of button parameters as described in
+ *             gtk_dialog_new_with_buttons().
+ *
+ * This function conveniently creates a #GimpViewableDialog using the
+ * information stored in @tool_info. It also registers the tool with
+ * the "toplevel" dialog factory.
+ *
+ * Return value: a new #GimpViewableDialog
+ **/
+GtkWidget *
+gimp_tool_dialog_new (GimpToolInfo *tool_info,
+                      GdkScreen    *screen,
+                      gint          monitor,
+                      const gchar  *title,
+                      const gchar  *description,
+                      const gchar  *icon_name,
+                      const gchar  *help_id,
+                      ...)
+{
+  GtkWidget *dialog;
+  gchar     *identifier;
+  va_list    args;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
+
+  if (! title)
+    title = tool_info->label;
+
+  if (! description)
+    description = tool_info->tooltip;
+
+  if (! help_id)
+    help_id = tool_info->help_id;
+
+  if (! icon_name)
+    icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
+
+  dialog = g_object_new (GIMP_TYPE_TOOL_DIALOG,
+                         "title",        title,
+                         "role",         gimp_object_get_name (tool_info),
+                         "description",  description,
+                         "icon-name",    icon_name,
+                         "help-func",    gimp_standard_help_func,
+                         "help-id",      help_id,
+                         NULL);
+
+  va_start (args, help_id);
+  gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
+  va_end (args);
+
+  identifier = g_strconcat (gimp_object_get_name (tool_info), "-dialog", NULL);
+
+  gimp_dialog_factory_add_foreign (gimp_dialog_factory_get_singleton (),
+                                   identifier,
+                                   dialog,
+                                   screen,
+                                   monitor);
+
+  g_free (identifier);
+
+  return dialog;
+}
+
+void
+gimp_tool_dialog_set_shell (GimpToolDialog   *tool_dialog,
+                            GimpDisplayShell *shell)
+{
+  GimpToolDialogPrivate *private = GET_PRIVATE (tool_dialog);
+
+  g_return_if_fail (GIMP_IS_TOOL_DIALOG (tool_dialog));
+  g_return_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell == private->shell)
+    return;
+
+  if (private->shell)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (private->shell),
+                                    (gpointer) &private->shell);
+      g_signal_handlers_disconnect_by_func (private->shell,
+                                            gimp_tool_dialog_shell_unmap,
+                                            tool_dialog);
+
+      gtk_window_set_transient_for (GTK_WINDOW (tool_dialog), NULL);
+    }
+
+  private->shell = shell;
+
+  if (private->shell)
+    {
+      GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+      gtk_window_set_transient_for (GTK_WINDOW (tool_dialog),
+                                    GTK_WINDOW (toplevel));
+
+      g_signal_connect_object (private->shell, "unmap",
+                               G_CALLBACK (gimp_tool_dialog_shell_unmap),
+                               tool_dialog, 0);
+      g_object_add_weak_pointer (G_OBJECT (private->shell),
+                                 (gpointer) &private->shell);
+    }
+}
+
+
+/*  private functions  */
+
+static void
+gimp_tool_dialog_shell_unmap (GimpDisplayShell *shell,
+                              GimpToolDialog   *dialog)
+{
+  /*  the dialog being mapped while the shell is being unmapped
+   *  happens when switching images in GimpImageWindow
+   */
+  if (gtk_widget_get_mapped (GTK_WIDGET (dialog)))
+    g_signal_emit_by_name (dialog, "close");
+}