moved ratio entry up.

2007-02-09  Sven Neumann  <sven@gimp.org>

	* app/tools/gimprectangleoptions.c: moved ratio entry up.


svn path=/trunk/; revision=21880
This commit is contained in:
Sven Neumann 2007-02-09 08:36:27 +00:00 committed by Sven Neumann
parent 181c9efbba
commit 538378e79c
2 changed files with 43 additions and 34 deletions

View File

@ -1,3 +1,7 @@
2007-02-09 Sven Neumann <sven@gimp.org>
* app/tools/gimprectangleoptions.c: moved ratio entry up.
2007-02-09 Michael Natterer <mitch@gimp.org> 2007-02-09 Michael Natterer <mitch@gimp.org>
* app/dialogs/module-dialog.c (dialog_info_init): ellipsize the * app/dialogs/module-dialog.c (dialog_info_init): ellipsize the

View File

@ -540,15 +540,52 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
/* Aspect */
frame = gimp_frame_new (NULL);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
button = gimp_prop_check_button_new (config, "fixed-aspect",
_("Fixed aspect ratio"));
gtk_frame_set_label_widget (GTK_FRAME (frame), button);
gtk_widget_show (button);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
entry = gimp_prop_aspect_ratio_new (config,
"aspect-numerator",
"aspect-denominator",
"fixed-aspect");
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);
g_signal_connect (entry, "notify::aspect",
G_CALLBACK (gimp_rectangle_options_notify_aspect),
config);
/* Highlight */
button = gimp_prop_check_button_new (config, "highlight", button = gimp_prop_check_button_new (config, "highlight",
_("Highlight")); _("Highlight"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
table = gtk_table_new (6, 6, FALSE); table = gtk_table_new (4, 6, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_row_spacings (GTK_TABLE (table), 3); gtk_table_set_row_spacings (GTK_TABLE (table), 3);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* X */ /* X */
entry = gimp_prop_size_entry_new (config, "x0", "unit", "%a", entry = gimp_prop_size_entry_new (config, "x0", "unit", "%a",
@ -594,39 +631,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 3, row, row + 1); gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 3, row, row + 1);
row++; row++;
/* Aspect */ /* Guide */
hbox = gtk_hbox_new (FALSE, 0);
gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
gtk_widget_show (hbox);
entry = gimp_prop_aspect_ratio_new (config,
"aspect-numerator",
"aspect-denominator",
"fixed-aspect");
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);
g_signal_connect (entry, "notify::aspect",
G_CALLBACK (gimp_rectangle_options_notify_aspect),
config);
button = gimp_prop_check_button_new (config, "fixed-aspect", _("Fix"));
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
gtk_widget_show (button);
gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 3, row, row + 1);
gtk_widget_show (table);
hbox = gtk_hbox_new (FALSE, 0); hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);