Adding upstream version 2.10.34.upstream/2.10.34upstream

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

1 files changed, 153 insertions, 0 deletions

diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
new file mode 100644
index 0000000..af9edd4
--- /dev/null
+++ b/app/dialogs/user-install-dialog.c
@@ -0,0 +1,153 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * user-install-dialog.c
+ * Copyright (C) 2000-2006 Michael Natterer and Sven Neumann
+ *
+ * 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 "dialogs-types.h"
+
+#include "core/gimp-user-install.h"
+
+#include "widgets/gimpmessagebox.h"
+#include "widgets/gimpmessagedialog.h"
+
+#include "user-install-dialog.h"
+
+#include "gimp-intl.h"
+
+
+static GtkWidget * user_install_dialog_new (GimpUserInstall *install);
+static void        user_install_dialog_log (const gchar     *message,
+                                            gboolean         error,
+                                            gpointer         data);
+
+
+gboolean
+user_install_dialog_run (GimpUserInstall *install)
+{
+  GtkWidget *dialog;
+  gboolean   success;
+
+  g_return_val_if_fail (install != NULL, FALSE);
+
+  dialog = user_install_dialog_new (install);
+
+  success = gimp_user_install_run (install);
+
+  if (! success)
+    {
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_main_quit),
+                        NULL);
+
+      gtk_widget_show (dialog);
+
+      gtk_main ();
+    }
+
+  gtk_widget_destroy (dialog);
+
+  return success;
+}
+
+static GtkWidget *
+user_install_dialog_new (GimpUserInstall *install)
+{
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *scrolled;
+  GtkTextBuffer *buffer;
+  GtkWidget     *view;
+
+  gimp_icons_init ();
+
+  dialog = gimp_message_dialog_new (_("GIMP User Installation"),
+                                    GIMP_ICON_WILBER_EEK,
+                                    NULL, 0, NULL, NULL,
+
+                                    _("_Quit"), GTK_RESPONSE_OK,
+
+                                    NULL);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     _("User installation failed!"));
+  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                             _("The GIMP user installation failed; "
+                               "see the log for details."));
+
+  frame = gimp_frame_new (_("Installation Log"));
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_container_add (GTK_CONTAINER (frame), scrolled);
+  gtk_widget_show (scrolled);
+
+  buffer = gtk_text_buffer_new (NULL);
+
+  gtk_text_buffer_create_tag (buffer, "bold",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+
+  view = gtk_text_view_new_with_buffer (buffer);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
+  gtk_widget_set_size_request (view, -1, 200);
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_widget_show (view);
+
+  g_object_unref (buffer);
+
+  gimp_user_install_set_log_handler (install, user_install_dialog_log, buffer);
+
+  return dialog;
+}
+
+static void
+user_install_dialog_log (const gchar *message,
+                         gboolean     error,
+                         gpointer     data)
+{
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+  GtkTextIter    cursor;
+
+  gtk_text_buffer_get_end_iter (buffer, &cursor);
+
+  if (error && message)
+    {
+      gtk_text_buffer_insert_with_tags_by_name (buffer, &cursor, message, -1,
+                                                "bold", NULL);
+    }
+  else if (message)
+    {
+      gtk_text_buffer_insert (buffer, &cursor, message, -1);
+    }
+
+  gtk_text_buffer_insert (buffer, &cursor, "\n", -1);
+}