gimp r25064 - in trunk: . app/tools

[neo svn gnome org]

Author: neo
Date: Sat Mar  8 14:07:16 2008
New Revision: 25064
URL: http://svn.gnome.org/viewvc/gimp?rev=25064&view=rev

Log:
2008-03-08  Sven Neumann  <sven gimp org>

	* app/tools/gimpflipoptions.c
	* app/tools/gimpmoveoptions.c
	* app/tools/gimpselectionoptions.c
	* app/tools/gimptransformoptions.c: don't add the label into the
	stock box, use an extra hbox with 2 pixels spacing.



Modified:
   trunk/ChangeLog
   trunk/app/tools/gimpflipoptions.c
   trunk/app/tools/gimpmoveoptions.c
   trunk/app/tools/gimpselectionoptions.c
   trunk/app/tools/gimptransformoptions.c

Modified: trunk/app/tools/gimpflipoptions.c
==============================================================================
--- trunk/app/tools/gimpflipoptions.c	(original)
+++ trunk/app/tools/gimpflipoptions.c	Sat Mar  8 14:07:16 2008
@@ -118,19 +118,23 @@
   GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *hbox;
+  GtkWidget *box;
   GtkWidget *label;
   GtkWidget *frame;
   gchar     *str;
 
-  hbox = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
+  hbox = gtk_hbox_new (FALSE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   label = gtk_label_new (_("Affect:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (hbox), label, 0);
   gtk_widget_show (label);
 
+  box = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
   /*  tool toggle  */
   str = g_strdup_printf (_("Flip Type  (%s)"),
                          gimp_get_mod_string (GDK_CONTROL_MASK));

Modified: trunk/app/tools/gimpmoveoptions.c
==============================================================================
--- trunk/app/tools/gimpmoveoptions.c	(original)
+++ trunk/app/tools/gimpmoveoptions.c	Sat Mar  8 14:07:16 2008
@@ -167,19 +167,23 @@
   GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *hbox;
+  GtkWidget *box;
   GtkWidget *label;
   GtkWidget *frame;
   gchar     *title;
 
-  hbox = gimp_prop_enum_stock_box_new (config, "move-type", "gimp", 0, 0);
+  hbox = gtk_hbox_new (FALSE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   label = gtk_label_new (_("Move:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (hbox), label, 0);
   gtk_widget_show (label);
 
+  box = gimp_prop_enum_stock_box_new (config, "move-type", "gimp", 0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
   /*  tool toggle  */
   title = g_strdup_printf (_("Tool Toggle  (%s)"),
                            gimp_get_mod_string (GDK_SHIFT_MASK));

Modified: trunk/app/tools/gimpselectionoptions.c
==============================================================================
--- trunk/app/tools/gimpselectionoptions.c	(original)
+++ trunk/app/tools/gimpselectionoptions.c	Sat Mar  8 14:07:16 2008
@@ -293,16 +293,25 @@
   {
     GtkWidget *hbox;
     GtkWidget *label;
+    GtkWidget *box;
     GList     *children;
     GList     *list;
     gint       i;
 
-    hbox = gimp_prop_enum_stock_box_new (config, "operation",
-                                         "gimp-selection", 0, 0);
+    hbox = gtk_hbox_new (FALSE, 2);
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
     gtk_widget_show (hbox);
 
-    children = gtk_container_get_children (GTK_CONTAINER (hbox));
+    label = gtk_label_new (_("Mode:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    box = gimp_prop_enum_stock_box_new (config, "operation",
+                                        "gimp-selection", 0, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+    gtk_widget_show (box);
+
+    children = gtk_container_get_children (GTK_CONTAINER (box));
 
     /*  add modifier keys to the tooltips  */
     for (list = children, i = 0; list; list = list->next, i++)
@@ -332,15 +341,10 @@
       }
 
     /*  move GIMP_CHANNEL_OP_REPLACE to the front  */
-    gtk_box_reorder_child (GTK_BOX (hbox),
+    gtk_box_reorder_child (GTK_BOX (box),
                            GTK_WIDGET (children->next->next->data), 0);
 
     g_list_free (children);
-
-    label = gtk_label_new (_("Mode:"));
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_box_reorder_child (GTK_BOX (hbox), label, 0);
-    gtk_widget_show (label);
   }
 
   /*  the antialias toggle button  */

Modified: trunk/app/tools/gimptransformoptions.c
==============================================================================
--- trunk/app/tools/gimptransformoptions.c	(original)
+++ trunk/app/tools/gimptransformoptions.c	Sat Mar  8 14:07:16 2008
@@ -258,6 +258,7 @@
   GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (tool_options);
   GtkWidget            *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget            *hbox;
+  GtkWidget            *box;
   GtkWidget            *label;
   GtkWidget            *frame;
   GtkWidget            *table;
@@ -265,15 +266,18 @@
   GtkWidget            *preview_box;
   const gchar          *constrain = NULL;
 
-  hbox = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
+  hbox = gtk_hbox_new (FALSE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   label = gtk_label_new (_("Transform:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (hbox), label, 0);
   gtk_widget_show (label);
 
+  box = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
+  gtk_widget_show (box);
+
   frame = gimp_prop_enum_radio_frame_new (config, "direction",
                                           _("Direction"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);