Adding upstream version 2.10.34.upstream/2.10.34upstream

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

1 files changed, 293 insertions, 0 deletions

diff --git a/app/display/gimpdisplayshell-rotate-dialog.c b/app/display/gimpdisplayshell-rotate-dialog.c
new file mode 100644
index 0000000..c899235
--- /dev/null
+++ b/app/display/gimpdisplayshell-rotate-dialog.c
@@ -0,0 +1,293 @@
+/* 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 "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "display-types.h"
+
+#include "core/gimp.h"
+#include "core/gimpviewable.h"
+
+#include "widgets/gimpdial.h"
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpviewabledialog.h"
+
+#include "gimpdisplay.h"
+#include "gimpdisplayshell.h"
+#include "gimpdisplayshell-rotate.h"
+#include "gimpdisplayshell-rotate-dialog.h"
+
+#include "gimp-intl.h"
+
+
+#define RESPONSE_RESET 1
+
+
+typedef struct
+{
+  GimpDisplayShell *shell;
+  GtkAdjustment    *rotate_adj;
+  gdouble           old_angle;
+} RotateDialogData;
+
+
+/*  local function prototypes  */
+
+static void  gimp_display_shell_rotate_dialog_response (GtkWidget         *widget,
+                                                        gint               response_id,
+                                                        RotateDialogData  *dialog);
+static void      gimp_display_shell_rotate_dialog_free (RotateDialogData  *dialog);
+
+static void      rotate_adjustment_changed             (GtkAdjustment     *adj,
+                                                        RotateDialogData  *dialog);
+static void      display_shell_rotated                 (GimpDisplayShell  *shell,
+                                                        RotateDialogData  *dialog);
+
+static gboolean  deg_to_rad                            (GBinding          *binding,
+                                                        const GValue      *from_value,
+                                                        GValue            *to_value,
+                                                        gpointer           user_data);
+static gboolean  rad_to_deg                            (GBinding          *binding,
+                                                        const GValue      *from_value,
+                                                        GValue            *to_value,
+                                                        gpointer           user_data);
+
+
+/*  public functions  */
+
+/**
+ * gimp_display_shell_rotate_dialog:
+ * @shell: the #GimpDisplayShell
+ *
+ * Constructs and displays a dialog allowing the user to enter a
+ * custom display rotate.
+ **/
+void
+gimp_display_shell_rotate_dialog (GimpDisplayShell *shell)
+{
+  RotateDialogData *data;
+  GimpImage        *image;
+  GtkWidget        *toplevel;
+  GtkWidget        *hbox;
+  GtkWidget        *spin;
+  GtkWidget        *dial;
+  GtkWidget        *label;
+
+  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+  if (shell->rotate_dialog)
+    {
+      gtk_window_present (GTK_WINDOW (shell->rotate_dialog));
+      return;
+    }
+
+  image = gimp_display_get_image (shell->display);
+
+  data = g_slice_new (RotateDialogData);
+
+  data->shell     = shell;
+  data->old_angle = shell->rotate_angle;
+
+  shell->rotate_dialog =
+    gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
+                              gimp_get_user_context (shell->display->gimp),
+                              _("Rotate View"), "display-rotate",
+                              GIMP_ICON_OBJECT_ROTATE_180,
+                              _("Select Rotation Angle"),
+                              GTK_WIDGET (shell),
+                              gimp_standard_help_func,
+                              GIMP_HELP_VIEW_ROTATE_OTHER,
+
+                              _("_Reset"),  RESPONSE_RESET,
+                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                              _("_OK"),     GTK_RESPONSE_OK,
+
+                              NULL);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (shell->rotate_dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_object_weak_ref (G_OBJECT (shell->rotate_dialog),
+                     (GWeakNotify) gimp_display_shell_rotate_dialog_free, data);
+
+  g_object_add_weak_pointer (G_OBJECT (shell->rotate_dialog),
+                             (gpointer) &shell->rotate_dialog);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+
+  gtk_window_set_transient_for (GTK_WINDOW (shell->rotate_dialog),
+                                GTK_WINDOW (toplevel));
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (shell->rotate_dialog), TRUE);
+
+  g_signal_connect (shell->rotate_dialog, "response",
+                    G_CALLBACK (gimp_display_shell_rotate_dialog_response),
+                    data);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell->rotate_dialog))),
+                      hbox, TRUE, TRUE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Angle:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  data->rotate_adj = (GtkAdjustment *)
+    gtk_adjustment_new (shell->rotate_angle, 0.0, 360.0, 1, 15, 0);
+  spin = gimp_spin_button_new (data->rotate_adj, 1.0, 2);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin), TRUE);
+  gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+  gtk_widget_show (spin);
+
+  label = gtk_label_new (_("degrees"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  dial = gimp_dial_new ();
+  g_object_set (dial,
+                "size",       32,
+                "background", GIMP_CIRCLE_BACKGROUND_PLAIN,
+                "draw-beta",  FALSE,
+                NULL);
+  gtk_box_pack_start (GTK_BOX (hbox), dial, FALSE, FALSE, 0);
+  gtk_widget_show (dial);
+
+  g_object_bind_property_full (data->rotate_adj, "value",
+                               dial,             "alpha",
+                               G_BINDING_BIDIRECTIONAL |
+                               G_BINDING_SYNC_CREATE,
+                               deg_to_rad,
+                               rad_to_deg,
+                               NULL, NULL);
+
+  g_signal_connect (data->rotate_adj, "value-changed",
+                    G_CALLBACK (rotate_adjustment_changed),
+                    data);
+  g_signal_connect (shell, "rotated",
+                    G_CALLBACK (display_shell_rotated),
+                    data);
+
+  gtk_widget_show (shell->rotate_dialog);
+}
+
+static void
+gimp_display_shell_rotate_dialog_response (GtkWidget        *widget,
+                                           gint              response_id,
+                                           RotateDialogData *dialog)
+{
+  switch (response_id)
+    {
+    case RESPONSE_RESET:
+      gtk_adjustment_set_value (dialog->rotate_adj, 0.0);
+      break;
+
+    case GTK_RESPONSE_CANCEL:
+      gtk_adjustment_set_value (dialog->rotate_adj, dialog->old_angle);
+      /* fall thru */
+
+    default:
+      gtk_widget_destroy (dialog->shell->rotate_dialog);
+      break;
+    }
+}
+
+static void
+gimp_display_shell_rotate_dialog_free (RotateDialogData *dialog)
+{
+  g_signal_handlers_disconnect_by_func (dialog->shell,
+                                        display_shell_rotated,
+                                        dialog);
+
+  g_slice_free (RotateDialogData, dialog);
+}
+
+static void
+rotate_adjustment_changed (GtkAdjustment    *adj,
+                           RotateDialogData *dialog)
+{
+  gdouble angle = gtk_adjustment_get_value (dialog->rotate_adj);
+
+  g_signal_handlers_block_by_func (dialog->shell,
+                                   display_shell_rotated,
+                                   dialog);
+
+  gimp_display_shell_rotate_to (dialog->shell, angle);
+
+  g_signal_handlers_unblock_by_func (dialog->shell,
+                                     display_shell_rotated,
+                                     dialog);
+}
+
+static void
+display_shell_rotated (GimpDisplayShell  *shell,
+                       RotateDialogData  *dialog)
+{
+  g_signal_handlers_block_by_func (dialog->rotate_adj,
+                                   rotate_adjustment_changed,
+                                   dialog);
+
+  gtk_adjustment_set_value (dialog->rotate_adj, shell->rotate_angle);
+
+  g_signal_handlers_unblock_by_func (dialog->rotate_adj,
+                                     rotate_adjustment_changed,
+                                     dialog);
+}
+
+static gboolean
+deg_to_rad (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble value = g_value_get_double (from_value);
+
+  value = 360.0 - value;
+
+  value *= G_PI / 180.0;
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}
+
+static gboolean
+rad_to_deg (GBinding     *binding,
+            const GValue *from_value,
+            GValue       *to_value,
+            gpointer      user_data)
+{
+  gdouble value = g_value_get_double (from_value);
+
+  value *= 180.0 / G_PI;
+
+  value = 360.0 - value;
+
+  g_value_set_double (to_value, value);
+
+  return TRUE;
+}