removed the "Density" label. It wasn't helpful and caused the transform

2004-10-15  Sven Neumann  <sven@gimp.org>

	* app/tools/gimptransformoptions.c: removed the "Density" label.
	It wasn't helpful and caused the transform options to be wider than
	necessary.

	* app/tools/gimpblendoptions.c
	* app/tools/gimppaintoptions-gui.c
	* app/tools/gimptransformoptions.c: let combo boxes expand
	horizontally like we do in other (all ?) dialogs.

	* app/widgets/gimptemplateeditor.c
	(gimp_template_editor_aspect_callback): update the pixel size label.
This commit is contained in:
Sven Neumann 2004-10-14 22:55:18 +00:00 committed by Sven Neumann
parent 550965744d
commit 428a80a1ee
5 changed files with 37 additions and 22 deletions

View File

@ -1,3 +1,17 @@
2004-10-15 Sven Neumann <sven@gimp.org>
* app/tools/gimptransformoptions.c: removed the "Density" label.
It wasn't helpful and caused the transform options to be wider than
necessary.
* app/tools/gimpblendoptions.c
* app/tools/gimppaintoptions-gui.c
* app/tools/gimptransformoptions.c: let combo boxes expand
horizontally like we do in other (all?) dialogs.
* app/widgets/gimptemplateeditor.c
(gimp_template_editor_aspect_callback): update the pixel size label.
2004-10-15 Sven Neumann <sven@gimp.org>
* data/images/gimp-splash.png: new splash by Jimmac.

View File

@ -252,13 +252,13 @@ gimp_blend_options_gui (GimpToolOptions *tool_options)
"gimp-gradient");
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("Shape:"), 0.0, 0.5,
combo, 2, TRUE);
combo, 2, FALSE);
/* the repeat option */
combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 5,
_("Repeat:"), 0.0, 0.5,
combo, 2, TRUE);
combo, 2, FALSE);
g_signal_connect (config, "notify::gradient-type",
G_CALLBACK (blend_options_gradient_type_notify),

View File

@ -105,7 +105,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
menu = gimp_prop_paint_mode_menu_new (config, "paint-mode", TRUE);
label = gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++,
_("Mode:"), 0.0, 0.5,
menu, 2, TRUE);
menu, 2, FALSE);
if (tool_type == GIMP_TYPE_ERASER_TOOL ||
tool_type == GIMP_TYPE_CONVOLVE_TOOL ||
@ -404,7 +404,7 @@ gradient_options_gui (GimpGradientOptions *gradient,
combo = gimp_prop_enum_combo_box_new (config, "gradient-repeat", 0, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Repeat:"), 0.0, 0.5,
combo, 2, TRUE);
combo, 2, FALSE);
gtk_widget_show (table);
}

View File

@ -340,7 +340,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (label);
combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo);
/* the supersample toggle button */
@ -369,7 +369,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (label);
combo = gimp_prop_enum_combo_box_new (config, "preview-type", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo);
/* the grid type menu */
@ -383,8 +383,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
/* the grid density scale */
table = gtk_table_new (1, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 2);
gtk_box_pack_start (GTK_BOX (button), table, FALSE, FALSE, 0);
gtk_widget_show (table);
@ -400,7 +399,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
gimp_prop_scale_entry_new (config, "grid-size",
GTK_TABLE (table), 0, 0,
_("Density:"),
NULL,
1.0, 8.0, 0,
FALSE, 0.0, 0.0);

View File

@ -597,17 +597,14 @@ gimp_template_editor_aspect_callback (GtkWidget *widget,
{
if (! editor->block_aspect && GTK_TOGGLE_BUTTON (widget)->active)
{
gint width;
gint height;
gdouble xresolution;
gdouble yresolution;
GimpTemplate *template = editor->template;
gint width = template->width;
gint height = template->height;
gdouble xresolution = template->xresolution;
gdouble yresolution = template->yresolution;
gchar *text;
width = editor->template->width;
height = editor->template->height;
xresolution = editor->template->xresolution;
yresolution = editor->template->yresolution;
if (editor->template->width == editor->template->height)
if (template->width == template->height)
{
editor->block_aspect = TRUE;
gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (editor->aspect_button),
@ -616,7 +613,7 @@ gimp_template_editor_aspect_callback (GtkWidget *widget,
return;
}
g_signal_handlers_block_by_func (editor->template,
g_signal_handlers_block_by_func (template,
gimp_template_editor_template_notify,
editor);
@ -625,16 +622,21 @@ gimp_template_editor_aspect_callback (GtkWidget *widget,
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (editor->size_se), 1,
xresolution, FALSE);
g_object_set (editor->template,
g_object_set (template,
"width", height,
"height", width,
"xresolution", yresolution,
"yresolution", xresolution,
NULL);
g_signal_handlers_unblock_by_func (editor->template,
g_signal_handlers_unblock_by_func (template,
gimp_template_editor_template_notify,
editor);
text = g_strdup_printf (_("%d x %d pixels"),
template->width, template->height);
gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
g_free (text);
}
}