[gimp] Bug 663531 - Two new button on the Offset dialog for x/2 and y/2

[Michael Natterer <mitch src gnome org>]

commit 77ab3271e30eb10c05bd7373443b900f04f3aed8
Author: Michael Natterer <mitch gimp org>
Date:   Sat Aug 25 20:34:27 2012 +0200

    Bug 663531 - Two new button on the Offset dialog for x/2 and y/2
    
    Add buttons to offset by width/2 and height/2 separately. This rarely
    used dialog's main purpose is making textures, and it doesn't hurt
    if it does this a little better at the expense of a little clutter.

 app/dialogs/offset-dialog.c |   82 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 66 insertions(+), 16 deletions(-)
---
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index bd24089..219066c 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -62,12 +62,16 @@ typedef struct
 
 /*  local function prototypes  */
 
-static void  offset_response            (GtkWidget    *widget,
-                                         gint          response_id,
-                                         OffsetDialog *dialog);
-static void  offset_halfheight_callback (GtkWidget    *widget,
-                                         OffsetDialog *dialog);
-static void  offset_dialog_free         (OffsetDialog *dialog);
+static void  offset_response         (GtkWidget    *widget,
+                                      gint          response_id,
+                                      OffsetDialog *dialog);
+static void  offset_half_xy_callback (GtkWidget    *widget,
+                                      OffsetDialog *dialog);
+static void  offset_half_x_callback  (GtkWidget    *widget,
+                                      OffsetDialog *dialog);
+static void  offset_half_y_callback  (GtkWidget    *widget,
+                                      OffsetDialog *dialog);
+static void  offset_dialog_free      (OffsetDialog *dialog);
 
 
 /*  public functions  */
@@ -153,12 +157,8 @@ offset_dialog_new (GimpDrawable *drawable,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (frame), hbox);
-  gtk_widget_show (hbox);
-
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
   spinbutton = gimp_spin_button_new (&adjustment,
@@ -210,12 +210,32 @@ offset_dialog_new (GimpDrawable *drawable,
   gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se), 0, 0);
   gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se), 1, 0);
 
-  button = gtk_button_new_with_mnemonic (_("Offset by  x/_2, y/2"));
+  button = gtk_button_new_with_mnemonic (_("By width/_2, height/2"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
-                    G_CALLBACK (offset_halfheight_callback),
+                    G_CALLBACK (offset_half_xy_callback),
+                    dialog);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  button = gtk_button_new_with_mnemonic ("By _width/2");
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (offset_half_x_callback),
+                    dialog);
+
+  button = gtk_button_new_with_mnemonic ("By _height/2");
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (offset_half_y_callback),
                     dialog);
 
   /*  The edge behavior frame  */
@@ -223,7 +243,7 @@ offset_dialog_new (GimpDrawable *drawable,
                                     G_CALLBACK (gimp_radio_button_update),
                                     &dialog->fill_type, dialog->fill_type,
 
-                                    _("_Wrap around"),
+                                    _("W_rap around"),
                                     WRAP_AROUND, NULL,
 
                                     _("Fill with _background color"),
@@ -280,8 +300,25 @@ offset_response (GtkWidget    *widget,
 }
 
 static void
-offset_halfheight_callback (GtkWidget    *widget,
-                            OffsetDialog *dialog)
+offset_half_xy_callback (GtkWidget    *widget,
+                         OffsetDialog *dialog)
+{
+  GimpImage *image = dialog->image;
+
+  if (image)
+    {
+      GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
+                                  0, gimp_item_get_width (item) / 2);
+      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
+                                  1, gimp_item_get_height (item) / 2);
+   }
+}
+
+static void
+offset_half_x_callback (GtkWidget    *widget,
+                        OffsetDialog *dialog)
 {
   GimpImage *image = dialog->image;
 
@@ -291,6 +328,19 @@ offset_halfheight_callback (GtkWidget    *widget,
 
       gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
                                   0, gimp_item_get_width (item) / 2);
+   }
+}
+
+static void
+offset_half_y_callback (GtkWidget    *widget,
+                        OffsetDialog *dialog)
+{
+  GimpImage *image = dialog->image;
+
+  if (image)
+    {
+      GimpItem *item = GIMP_ITEM (gimp_image_get_active_drawable (image));
+
       gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (dialog->off_se),
                                   1, gimp_item_get_height (item) / 2);
    }