From fbc67ff207002015a9e3ee29480e1888470e0dc9 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 8 Feb 2007 16:36:23 +0000 Subject: [PATCH] reduced default spacing. 2007-02-08 Sven Neumann * libgimpwidgets/gimpenumwidgets.c (gimp_enum_stock_box_new_with_range): reduced default spacing. * app/tools/gimpcurvestool.c (gimp_curves_tool_dialog): don't increase the box's spacing. * app/tools/gimprectangleoptions.c: added portrait/landscape buttons. * app/widgets/gimppropwidgets.c (gimp_prop_aspect_ratio_new): reduced default width of entry. Swap width and height when the aspect changes and fixed-aspect is chosen. svn path=/trunk/; revision=21873 --- ChangeLog | 15 +++++++++ app/tools/gimpcurvestool.c | 1 - app/tools/gimprectangleoptions.c | 42 ++++++++++++++++-------- app/widgets/gimppropwidgets.c | 56 +++++++++++++------------------- libgimpwidgets/gimpenumwidgets.c | 2 +- 5 files changed, 67 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2e59c610f..cf3eafcc19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-02-08 Sven Neumann + + * libgimpwidgets/gimpenumwidgets.c + (gimp_enum_stock_box_new_with_range): reduced default spacing. + + * app/tools/gimpcurvestool.c (gimp_curves_tool_dialog): don't + increase the box's spacing. + + * app/tools/gimprectangleoptions.c: added portrait/landscape + buttons. + + * app/widgets/gimppropwidgets.c (gimp_prop_aspect_ratio_new): + reduced default width of entry. Swap width and height when the + aspect changes and fixed-aspect is chosen. + 2007-02-08 Sven Neumann * app/tools/gimprectangleoptions.c diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 2d027fb48b..b87b7b76c8 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -718,7 +718,6 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) gimp_enum_stock_box_set_child_padding (hbox, padding, -1); gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); - gtk_box_set_spacing (GTK_BOX (hbox), 4); gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_widget_show (hbox); diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c index 0959d3b40a..a461d73581 100644 --- a/app/tools/gimprectangleoptions.c +++ b/app/tools/gimprectangleoptions.c @@ -489,17 +489,19 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options) { GimpRectangleOptionsPrivate *private; - GObject *config = G_OBJECT (tool_options); - GtkWidget *vbox = gimp_tool_options_gui (tool_options); - GtkWidget *button; - GtkWidget *combo; - GtkWidget *table; - GtkWidget *entry; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *vbox2; - GtkWidget *frame; - gint row; + GObject *config = G_OBJECT (tool_options); + GtkWidget *vbox = gimp_tool_options_gui (tool_options); + GtkWidget *button; + GtkWidget *combo; + GtkWidget *table; + GtkWidget *entry; + GtkWidget *hbox; + GtkWidget *label; + GtkWidget *vbox2; + GtkWidget *frame; + GtkWidget *aspect; + GList *children; + gint row; private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (tool_options); @@ -599,15 +601,29 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options) gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, row, row + 1); gtk_widget_show (label); + hbox = gtk_hbox_new (FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 2, 5, row, row + 1); + gtk_widget_show (hbox); + entry = gimp_prop_aspect_ratio_new (config, "aspect-numerator", "aspect-denominator", "fixed-aspect", "width", "height"); - gtk_table_attach_defaults (GTK_TABLE (table), entry, 2, 5, row, row + 1); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); gtk_widget_show (entry); + aspect = gimp_prop_enum_stock_box_new (G_OBJECT (entry), + "aspect", "gimp", -1, -1); + gtk_box_pack_start (GTK_BOX (hbox), aspect, FALSE, FALSE, 0); + gtk_widget_show (aspect); + + /* hide "square" */ + children = gtk_container_get_children (GTK_CONTAINER (aspect)); + gtk_widget_hide (children->data); + g_list_free (children); + button = gimp_prop_check_button_new (config, "fixed-aspect", _("Fix")); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); gtk_widget_show (button); @@ -616,7 +632,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options) gtk_widget_show (table); hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); combo = gimp_prop_enum_combo_box_new (config, "guide", 0, 0); diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index ded3a4fdd8..a3aff929cc 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -562,7 +562,8 @@ static void gimp_prop_ratio_entry_notify (GObject *config, GParamSpec *param_spec, GtkEntry *entry); -static void gimp_prop_aspect_ratio_flip (GtkWidget *widget, +static void gimp_prop_aspect_notify_aspect (GtkWidget *widget, + GParamSpec *param_spec, AspectData *data); static void gimp_prop_aspect_ratio_changed (GtkWidget *widget, AspectData *data); @@ -609,7 +610,7 @@ gimp_prop_aspect_ratio_new (GObject *config, aspect_data->height_property = height_property; entry = gimp_ratio_entry_new (); - gtk_entry_set_width_chars (GTK_ENTRY (entry), 9); + gtk_entry_set_width_chars (GTK_ENTRY (entry), 7); g_object_set_data (G_OBJECT (entry), "gimp-ratio-entry-aspect-data", aspect_data); @@ -617,6 +618,9 @@ gimp_prop_aspect_ratio_new (GObject *config, gimp_ratio_entry_set_fraction (GIMP_RATIO_ENTRY (entry), numerator, denominator); + g_signal_connect (entry, "notify::aspect", + G_CALLBACK (gimp_prop_aspect_notify_aspect), + aspect_data); g_signal_connect (entry, "ratio-changed", G_CALLBACK (gimp_prop_aspect_ratio_changed), aspect_data); @@ -651,13 +655,10 @@ gimp_prop_ratio_entry_notify (GObject *config, } static void -gimp_prop_aspect_ratio_flip (GtkWidget *widget, - AspectData *data) +gimp_prop_aspect_notify_aspect (GtkWidget *widget, + GParamSpec *param_spec, + AspectData *data) { - gdouble numerator; - gdouble denominator; - gdouble height; - gdouble width; gboolean fixed_aspect = FALSE; if (data->fixed_aspect_property) @@ -667,36 +668,23 @@ gimp_prop_aspect_ratio_flip (GtkWidget *widget, NULL); } - g_object_get (data->config, - data->numerator_property, &numerator, - data->denominator_property, &denominator, - NULL); + if (! fixed_aspect) + return; - if (fixed_aspect) + if (data->width_property && data->height_property) { - if (data->width_property && data->height_property) - { - g_object_get (data->config, - data->width_property, &width, - data->height_property, &height, - NULL); - } - } + gdouble height; + gdouble width; - g_object_set (data->config, - data->numerator_property, denominator, - data->denominator_property, numerator, - NULL); + g_object_get (data->config, + data->width_property, &width, + data->height_property, &height, + NULL); - if (fixed_aspect) - { - if (data->width_property && data->height_property) - { - g_object_set (data->config, - data->width_property, height, - data->height_property, width, - NULL); - } + g_object_set (data->config, + data->width_property, height, + data->height_property, width, + NULL); } } diff --git a/libgimpwidgets/gimpenumwidgets.c b/libgimpwidgets/gimpenumwidgets.c index ae2ffaa25f..e4d00f4c72 100644 --- a/libgimpwidgets/gimpenumwidgets.c +++ b/libgimpwidgets/gimpenumwidgets.c @@ -337,7 +337,7 @@ gimp_enum_stock_box_new_with_range (GType enum_type, enum_class = g_type_class_ref (enum_type); - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_hbox_new (FALSE, 0); g_object_weak_ref (G_OBJECT (hbox), (GWeakNotify) g_type_class_unref, enum_class);